summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/commandline/git.nix7
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:
4 4
5{ 5{
6 environment = { 6 environment = {
7 systemPackages = [pkgs.git-branchless]; 7 systemPackages = with pkgs; [unstable.git-branchless gitoxide watchman];
8 shellAliases.git = "git-branchless wrap --"; 8 shellAliases.git = "git-branchless wrap --";
9 }; 9 };
10 10
@@ -36,7 +36,10 @@ inputs:
36 pager = deltaCommand; 36 pager = deltaCommand;
37 interactive.diffFilter = "${deltaCommand} --color-only"; 37 interactive.diffFilter = "${deltaCommand} --color-only";
38 untrackedCache = true; 38 untrackedCache = true;
39 fsmonitor = true; 39 # Use same package as above
40 # Also, the fact that gitFull depends on Perl
41 # means that the shebang was fixed
42 fsmonitor = "${pkgs.gitAndTools.gitFull}/share/git-core/templates/hooks/fsmonitor-watchman.sample";
40 }; 43 };
41 44
42 diff = { 45 diff = {