summary refs log tree commit diff stats
path: root/user
diff options
context:
space:
mode:
authorAlan Pearce2024-05-11 15:29:52 +0200
committerAlan Pearce2024-05-11 15:29:52 +0200
commitc7dc45f3918e80c252f92932d8dabd7f2496b65e (patch)
tree4cc6911cf4507ff47ed5aadd500236a26fc14f02 /user
parent22b2b2d668e522991a253dc18cad579b7a849546 (diff)
downloadnixfiles-c7dc45f3918e80c252f92932d8dabd7f2496b65e.tar.lz
nixfiles-c7dc45f3918e80c252f92932d8dabd7f2496b65e.tar.zst
nixfiles-c7dc45f3918e80c252f92932d8dabd7f2496b65e.zip
git: move tool install/config to git.nix
Diffstat (limited to 'user')
-rw-r--r--user/settings/git.nix13
-rw-r--r--user/settings/shell.nix14
2 files changed, 13 insertions, 14 deletions
diff --git a/user/settings/git.nix b/user/settings/git.nix
index e5f4770b..bc43a523 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -89,7 +89,20 @@
       ".tabnine_root"
     ];
   };
+  programs.gh = {
+    enable = true;
+    settings = {
+      git_protocol = "ssh";
+      aliases = {
+        fork = "repo fork --remote --remote-name alanpearce --default-branch-only";
+      };
+    };
+  };
   home.packages = with pkgs; [
     git-extras # delete-merged-branches and friends
+    ghq
+    delta
+    gitui
+    gitstatus
   ];
 }
diff --git a/user/settings/shell.nix b/user/settings/shell.nix
index 3b4bb1f4..5358f618 100644
--- a/user/settings/shell.nix
+++ b/user/settings/shell.nix
@@ -141,22 +141,8 @@ in
       sngc = "sudo nix-collect-garbage --delete-older-than 30d";
     };
   };
-  programs.gh = {
-    enable = true;
-    settings = {
-      git_protocol = "ssh";
-      aliases = {
-        fork = "repo fork --remote --remote-name fork --default-branch-only";
-      };
-    };
-  };
   home.packages = with pkgs; [
     fzf
-    ghq
-    delta
-    git
-    gitui
-    gitstatus
     up
   ];
 }