From cdc4bdffb68a38f08647067f53b8fd2f0e1c1832 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Thu, 23 Jan 2025 20:49:27 -0500
Subject: [PATCH] Git buildEnv is failing.

---
 nix/configuration/hosts/odo/default.nix |  2 +-
 nix/configuration/roles/git/default.nix | 98 ++++++++++++-------------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/nix/configuration/hosts/odo/default.nix b/nix/configuration/hosts/odo/default.nix
index cb952cb..4e276b7 100644
--- a/nix/configuration/hosts/odo/default.nix
+++ b/nix/configuration/hosts/odo/default.nix
@@ -37,7 +37,7 @@
   me.docker.enable = true;
   me.emacs_flavor = "full";
   me.firefox.enable = true;
-  me.git.config = ./roles/git/files/gitconfig_home;
+  me.git.config = ../../roles/git/files/gitconfig_home;
   me.graphical = true;
   me.graphics_card_type = "amd";
   me.kanshi.enable = true;
diff --git a/nix/configuration/roles/git/default.nix b/nix/configuration/roles/git/default.nix
index 1af67a8..24183f7 100644
--- a/nix/configuration/roles/git/default.nix
+++ b/nix/configuration/roles/git/default.nix
@@ -32,54 +32,54 @@
           };
         };
     })
-    (lib.mkIf (config.me.graphical) {
-      nixpkgs.overlays = [
-        (final: prev: {
-          git = pkgs.buildEnv {
-            name = prev.git.name;
-            paths = [
-              prev.git
-            ];
-            extraOutputsToInstall = [
-              "man"
-              "doc"
-              "info"
-            ];
-            buildInputs = [ final.makeWrapper ];
-            postBuild = ''
-              wrapProgram $out/bin/git --prefix PATH : ${
-                lib.makeBinPath [
-                  final.meld
-                ]
-              }
-            '';
-          };
-        })
-      ];
-    })
-    (lib.mkIf (!config.me.graphical) {
-      nixpkgs.overlays = [
-        (final: prev: {
-          git = pkgs.buildEnv {
-            name = prev.git.name;
-            paths = [
-              prev.git
-            ];
-            extraOutputsToInstall = [
-              "man"
-              "doc"
-              "info"
-            ];
-            buildInputs = [ final.makeWrapper ];
-            postBuild = ''
-              wrapProgram $out/bin/git --prefix PATH : ${
-                lib.makeBinPath [
-                ]
-              }
-            '';
-          };
-        })
-      ];
-    })
+    # (lib.mkIf (config.me.graphical) {
+    #   nixpkgs.overlays = [
+    #     (final: prev: {
+    #       git = pkgs.buildEnv {
+    #         name = prev.git.name;
+    #         paths = [
+    #           prev.git
+    #         ];
+    #         extraOutputsToInstall = [
+    #           "man"
+    #           "doc"
+    #           "info"
+    #         ];
+    #         buildInputs = [ final.makeWrapper ];
+    #         postBuild = ''
+    #           wrapProgram $out/bin/git --prefix PATH : ${
+    #             lib.makeBinPath [
+    #               final.meld
+    #             ]
+    #           }
+    #         '';
+    #       };
+    #     })
+    #   ];
+    # })
+    # (lib.mkIf (!config.me.graphical) {
+    #   nixpkgs.overlays = [
+    #     (final: prev: {
+    #       git = pkgs.buildEnv {
+    #         name = prev.git.name;
+    #         paths = [
+    #           prev.git
+    #         ];
+    #         extraOutputsToInstall = [
+    #           "man"
+    #           "doc"
+    #           "info"
+    #         ];
+    #         buildInputs = [ final.makeWrapper ];
+    #         postBuild = ''
+    #           wrapProgram $out/bin/git --prefix PATH : ${
+    #             lib.makeBinPath [
+    #             ]
+    #           }
+    #         '';
+    #       };
+    #     })
+    #   ];
+    # })
   ];
 }