summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/commandline/git.nix6
-rw-r--r--usecases/desktop/development.nix1
2 files changed, 6 insertions, 1 deletions
diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index 24babd7..96a95a8 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -87,6 +87,10 @@ _inputs:
87 } 87 }
88 ]; 88 ];
89 89
90 users.extraUsers.minijackson.packages = [
91 pkgs.watchman
92 ];
93
90 # TODO: move common to NixOS' programs.git.config 94 # TODO: move common to NixOS' programs.git.config
91 home-manager.users.minijackson.programs = { 95 home-manager.users.minijackson.programs = {
92 git.signing = { 96 git.signing = {
@@ -98,6 +102,8 @@ _inputs:
98 enable = true; 102 enable = true;
99 package = pkgs.unstable.jujutsu; 103 package = pkgs.unstable.jujutsu;
100 settings = { 104 settings = {
105 core.fsmonitor = "watchman";
106
101 merge-tools = { 107 merge-tools = {
102 difft.diff-args = [ 108 difft.diff-args = [
103 "--color=always" 109 "--color=always"
diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix
index 4146352..4c5abbb 100644
--- a/usecases/desktop/development.nix
+++ b/usecases/desktop/development.nix
@@ -41,7 +41,6 @@ in
41 41
42 git-absorb 42 git-absorb
43 gitoxide 43 gitoxide
44 watchman
45 44
46 shfmt 45 shfmt
47 taplo 46 taplo