common/git: setup watchman fsmonitor, add gitoxide

1 files changed, 5 insertions, 2 deletions

diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index 8ce89b6..e376fa6 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -4,7 +4,7 @@ inputs:
 
 {
   environment = {
-    systemPackages = [pkgs.git-branchless];
+    systemPackages = with pkgs; [unstable.git-branchless gitoxide watchman];
     shellAliases.git = "git-branchless wrap --";
   };
 
@@ -36,7 +36,10 @@ inputs:
             pager = deltaCommand;
             interactive.diffFilter = "${deltaCommand} --color-only";
             untrackedCache = true;
-            fsmonitor = true;
+            # Use same package as above
+            # Also, the fact that gitFull depends on Perl
+            # means that the shebang was fixed
+            fsmonitor = "${pkgs.gitAndTools.gitFull}/share/git-core/templates/hooks/fsmonitor-watchman.sample";
           };
 
           diff = {