From b4f956473c3f5e87162d8f1c0a8e4a68e2cc6a5f Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Thu, 5 Dec 2024 17:26:52 -0500
Subject: [PATCH] move git from cli to devtools & add gh

---
 modules/cli/default.nix | 17 -----------------
 modules/devtools.nix    | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 2aeb507..ddb34e4 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -20,7 +20,6 @@
     nix-diff
     nixfmt-rfc-style
     nix-index
-    nix-prefetch-github
     nodejs
     openssl
     parted
@@ -104,22 +103,6 @@
     );
   };
 
-  programs.git = {
-    enable = true;
-    config = {
-      alias.up = "push";
-      alias.dn = "pull";
-      alias.sh = "show";
-      alias.glog = "log --all --decorate --oneline --graph";
-      alias.glogl = "log --all --decorate --oneline --graph -n10";
-      alias.logl = "log --oneline -n10";
-      alias.vlog = "log --name-status";
-      core.pager = "less -x1,5";
-      pull.ff = "only";
-      init.defaultBranch = "main";
-    };
-  };
-
   programs.tmux = {
     enable = true;
     terminal = "screen-256color";
diff --git a/modules/devtools.nix b/modules/devtools.nix
index 92fbf65..559ea4e 100644
--- a/modules/devtools.nix
+++ b/modules/devtools.nix
@@ -16,12 +16,14 @@ in
       cargo
       efm-langserver
       errcheck
+      gh
       go
       gopls
       kubectl
       kubernetes-helm
       lua-language-server
       nil
+      nix-prefetch-github
       nodePackages.prettier
       nodePackages.typescript-language-server
       pyright
@@ -46,5 +48,21 @@ in
       source <(kubectl completion bash)
       complete -F __start_kubectl k
     '';
+
+    programs.git = {
+      enable = true;
+      config = {
+        alias.up = "push";
+        alias.dn = "pull";
+        alias.sh = "show";
+        alias.glog = "log --all --decorate --oneline --graph";
+        alias.glogl = "log --all --decorate --oneline --graph -n10";
+        alias.logl = "log --oneline -n10";
+        alias.vlog = "log --name-status";
+        core.pager = "less -x1,5";
+        pull.ff = "only";
+        init.defaultBranch = "main";
+      };
+    };
   };
 }