[dev] Adds more dev tools (git, kubernetes) and meta packages

home-manager/drew.nix

@@ -3,12 +3,11 @@
   imports = [
     ./features/audio.nix
     ./features/hyprland.nix
-    ./features/neovim.nix
+    ./features/development-linux.nix
-    ./features/shell.nix
-    ./features/ssh.nix
-    ./features/terminal.nix
   ];
 
+  home.stateVersion = "24.11";
+
   home.username = "drew";
   home.homeDirectory = "/home/drew";
 
@@ -93,5 +92,8 @@
     style.name = "adwaita-dark";
   };
 
-  home.stateVersion = "24.11";
+  programs.git = {
+    userName = "Drew Haven";
+    userEmail = "drew.haven@gmail.com";
+  };
 }

home-manager/features/development-linux.nix

@@ -0,0 +1,8 @@
+# Meta-package for development on linux
+{...}:
+{
+  imports = [
+    ./development.nix
+    ./ssh.nix
+  ]
+}

home-manager/features/development.nix

@@ -0,0 +1,9 @@
+{ ... }:
+{
+  imports = [
+    ./git.nix
+    ./shell.nix
+    ./terminal.nix
+    ./neovim.nix
+  ];
+}

home-manager/features/git.nix

@@ -0,0 +1,25 @@
+{ ... }:
+{
+  programs.git = {
+    enable = true;
+    aliases = {
+      "co" = "checkout";
+      "s" = "status";
+      "b" = "branch";
+      "r" = "remote";
+      "amend" = "commit -a --amend --no-edit";
+      "c" = "commit -am";
+    };
+    extraConfig = {
+      core = {
+        pager = "";
+      };
+      pull = {
+        rebase = true;
+      };
+      log = {
+        date = "iso";
+      };
+    };
+  };
+}

home-manager/features/kubernetes.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    kubectl  
+  ];
+ 
+  home.shellAliases = {
+      k = "kubectl";
+  };
+}

home-manager/features/shell.nix

@@ -12,8 +12,6 @@
       # Make ^U work like it does in Bash
       bindkey "^U" backward-kill-line
 
-      alias 'p?'='ps ax | grep'
-
       # This doesn't seem to be in the homemanager options
       # Makes shells incrementally append history so that new shells have the history of open shells
       setopt inc_append_history

home-manager/features/terminal.nix

@@ -32,6 +32,10 @@
     nerd-fonts.jetbrains-mono
   ];
 
+  home.shellAliases = {
+    "p?" = "ps ax | grep";
+  };
+
   # Allow Home Manager to set fonts.
   fonts.fontconfig.enable = true;
 

system/hosts/tarro-mbp/drew.nix

@@ -1,10 +1,9 @@
 { pkgs, self, ... }:
 {
   imports = [
-     ../../../home-manager/features/shell.nix
+    ../../../home-manager/features/development.nix
-     ../../../home-manager/features/terminal.nix
+    ../../../home-manager/features/kubernetes.nix
-     ../../../home-manager/features/neovim.nix
+    ../../../home-manager/features/macos
-     ../../../home-manager/features/macos
   ];
 
   home.username = "drew";
@@ -17,4 +16,9 @@
   ];
 
   home.stateVersion = "24.11";
+
+  programs.git = {
+    userName = "Drew Haven";
+    userEmail = "drew.haven@tarro.com";
+  };
 }