about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-03-13T16·54+0000
committerWilliam Carroll <wpcarro@gmail.com>2020-03-13T16·54+0000
commitbeeed2baa2ae80dd357ef880819a71926a4dfa44 (patch)
treec34cf957b703682cbfee0c7c3a1cb35cc175a5f3
parentbd67b07f52c5a32fb8f3a4388d896ac01c0dbc42 (diff)
Prefer locally installed /usr/bin/git
From what I understand, gLinux and Nix are sometimes compatible and sometimes
incompatible.

Some nix-installed programs rely on system state that differs from gLinux's
system state. In other cases, Google wraps existing programs (e.g. git) to
provide Google-specific configuration.

Ever since I switched to home-manager and set `programs.git.enable = true`,
magit, which uses the git that PATH exposes hasn't been able to push, fetch, and
a few other commands.

TODO(wpcarro): Define a base home.nix that my gLinux and NixOS machines can
extend.
-rw-r--r--configs/.config/nixpkgs/home.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/configs/.config/nixpkgs/home.nix b/configs/.config/nixpkgs/home.nix
index 08dd489b9988..5d1f575eabe9 100644
--- a/configs/.config/nixpkgs/home.nix
+++ b/configs/.config/nixpkgs/home.nix
@@ -41,6 +41,9 @@
 
   programs.git = {
     enable = true;
+    package = pkgs.writeShellScriptBin "git" ''
+      exec /usr/bin/git "$@"
+    '';
     userName = "William Carroll";
     userEmail = "wpcarro@gmail.com";
     aliases = {