flake.nix

@@ -77,12 +77,12 @@
           nixvim.homeManagerModules.nixvim
         ];
       };
-      "gabe@gv-workstation" = home-manager.lib.homeManagerConfiguration {
+      "gabe@workstation" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
         extraSpecialArgs = {inherit inputs outputs;};
         # > Our main home-manager configuration file <
         modules = [
-          ./hosts/gabe-gv-workstation.nix
+          ./hosts/gabe-workstation.nix
           nixvim.homeManagerModules.nixvim
         ];
       };

hosts/archlaptop-vm/home.nix

@@ -24,9 +24,9 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../../modules/home-manager/terminal
-    ../../modules/home-manager
-    ../../modules/home-manager/kittty
+    ../../modules/home-manager/terminal/terminal.nix
+    ../../modules/home-manager/home-manager.nix
+    ../../modules/home-manager/kittty/kitty.nix
     inputs.nixvim.homeManagerModules.nixvim
   ];
 }

hosts/gabe-archlaptop.nix

@@ -24,7 +24,7 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../modules/home-manager/terminal
-    ../modules/home-manager
+    ../modules/home-manager/terminal/terminal.nix
+    ../modules/home-manager/home-manager.nix
   ];
 }

hosts/gabe-workstation.nix

@@ -27,7 +27,7 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../modules/home-manager/terminal
-    ../modules/home-manager
+    ../modules/home-manager/terminal/terminal.nix
+    ../modules/home-manager/home-manager.nix
   ];
 }

hosts/workstation-vm/home.nix

@@ -24,9 +24,9 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../../modules/home-manager/terminal
-    ../../modules/home-manager
-    ../../modules/home-manager/kittty
+    ../../modules/home-manager/terminal/terminal.nix
+    ../../modules/home-manager/home-manager.nix
+    ../../modules/home-manager/kittty/kitty.nix
     inputs.nixvim.homeManagerModules.nixvim
   ];
 }

justfile

@@ -1,16 +1,16 @@
 default:
     just --list
 
-nixos target=`hostname`:
+nixos target:
     sudo nixos-rebuild --flake .#{{target}} switch
 
-home-manager target=(`whoami`+"@"+`hostname`):
+home-manager target:
     home-manager --flake .#{{target}} switch
 
-check-home-manager target=(`whoami`+"@"+`hostname`):
+check-home-manager target:
     home-manager build --no-out-link --flake .#{{target}}
 
-bootstrap-home-manager target=(`whoami`+"@"+`hostname`):
+bootstrap-home-manager target:
     nix run --extra-experimental-features "nix-command flakes" --no-write-lock-file github:nix-community/home-manager/ -- --extra-experimental-features "nix-command flakes" --flake .#{{target}} switch
 
 format:

modules/home-manager/terminal/git.nix

@@ -32,13 +32,7 @@
         graph = "log --graph --topo-order --all --pretty=format:'%C(auto)%h %C(cyan)%an %C(blue)%ar %C(auto)%d %s'";
         recent = "branch --sort=-committerdate --format='%(committerdate:relative)%09%(refname:short)'";
       };
-      delta = {
-        enable = true;
-        options = {
-          side-by-side = true;
-          line-numbers = true;
-        };
-      };
+      delta.enable = true;
       # difftastic.enable=true;
       # difftastic.background="dark";
       userEmail = config.host.git.profile.email;
@@ -74,7 +68,7 @@
         if config.host.git.workProfile.enable
         then [
           {
-            condition = "gitdir:~/work/**";
+            condition = "gitdir:~/work/";
             contents.user.email = config.host.git.workProfile.email;
           }
         ]

modules/home-manager/terminal/nvim/nvim.nix

@@ -31,8 +31,8 @@
     ./gitsigns.nix
     ./which-key.nix
     ./telescope.nix
-    ./treesitter
-    ./cmp
-    ./lsp
+    ./treesitter/treesitter.nix
+    ./cmp/cmp.nix
+    ./lsp/lsp.nix
   ];
 }

modules/home-manager/terminal/terminal.nix

@@ -39,13 +39,13 @@
   };
 
   imports = [
-    ./nushell
+    ./nushell/nushell.nix
     ./zsh.nix
     ./git.nix
     ./starship.nix
     ./voice.nix
-    ./nvim
-    ./zellij
+    ./nvim/nvim.nix
+    ./zellij/zellij.nix
   ];
 
   programs = {