diff --git a/flake.nix b/flake.nix
index 9c3ff54..43389f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,8 +53,9 @@
     # Standalone home-manager configuration entrypoint
     # Available through 'home-manager --flake .#your-username@your-hostname'
     homeConfigurations = {
-      "gabe@archlaptop" = import ./hosts/gabe-archlaptop.nix {inherit inputs outputs;};
-      "gabe@gv-workstation" = import ./hosts/gabe-gv-workstation.nix {inherit inputs outputs;};
+      "gabe@archlaptop" = import ./hosts/home-personal.nix {inherit inputs outputs;};
+      "gabe@linuxgamingrig" = import ./hosts/home-personal.nix {inherit inputs outputs;};
+      "gabe@gv-workstation" = import ./hosts/home-workstation.nix {inherit inputs outputs;};
     };
   };
 }
diff --git a/hosts/gabe-archlaptop.nix b/hosts/home-personal.nix
similarity index 95%
rename from hosts/gabe-archlaptop.nix
rename to hosts/home-personal.nix
index f43c731..eb4cc7d 100644
--- a/hosts/gabe-archlaptop.nix
+++ b/hosts/home-personal.nix
@@ -35,12 +35,12 @@ inputs.home-manager.lib.homeManagerConfiguration {
       home.homeDirectory = /home/gabe;
       imports = [
         ../roles/home-manager/terminal.nix
-        ../modules/home-manager/nvim
         ../modules/home-manager/common.nix
         ../modules/home-manager/syncthing.nix
         ../modules/home-manager/beets.nix
         ../modules/home-manager/mpd/mpd.nix
         ../modules/home-manager/email.nix
+        ../modules/home-manager/terminal/voice.nix
       ];
     })
     inputs.nixvim.homeManagerModules.nixvim
diff --git a/hosts/gabe-gv-workstation.nix b/hosts/home-workstation.nix
similarity index 96%
rename from hosts/gabe-gv-workstation.nix
rename to hosts/home-workstation.nix
index 4dccacd..032c78d 100644
--- a/hosts/gabe-gv-workstation.nix
+++ b/hosts/home-workstation.nix
@@ -38,7 +38,6 @@ inputs.home-manager.lib.homeManagerConfiguration {
       home.homeDirectory = /home/gabe;
       imports = [
         ../roles/home-manager/terminal.nix
-        ../modules/home-manager/nvim
         ../modules/home-manager/common.nix
         ../modules/home-manager/syncthing.nix
         ../modules/home-manager/email.nix
diff --git a/justfile b/justfile
index 4a9f07c..d2d529a 100644
--- a/justfile
+++ b/justfile
@@ -2,12 +2,15 @@ default:
     just --list
 
 nixos target=`hostname`:
+    git add -AN
     sudo nixos-rebuild --flake .#{{target}} switch
 
 home-manager target=(`whoami`+"@"+`hostname`):
+    git add -AN
     home-manager --flake .#{{target}} switch
 
 check-home-manager target=(`whoami`+"@"+`hostname`):
+    git add -AN
     home-manager build --no-out-link --flake .#{{target}}
 
 bootstrap-home-manager target=(`whoami`+"@"+`hostname`):
diff --git a/modules/home-manager/terminal/zsh.nix b/modules/home-manager/terminal/zsh.nix
index d492991..a5d4aa5 100644
--- a/modules/home-manager/terminal/zsh.nix
+++ b/modules/home-manager/terminal/zsh.nix
@@ -29,6 +29,15 @@
         setopt COMPLETE_ALIASES
         #select first item when you press tab the first time.
         setopt MENU_COMPLETE
+        #case insensitive globbing
+        setopt NO_CASE_GLOB
+        #sort globs that expand to numbers by number rather than alphabeticly
+        setopt NUMERIC_GLOB_SORT
+        #allows for some neat globbing.
+        setopt EXTENDED_GLOB
+        #allow backspacing beyond the point you entered insert mode:
+        bindkey -v '^?' backward-delete-char
+        bindkey "^W" backward-kill-word
       ''
       (lib.mkIf (!config.programs.starship.enable) ''
         autoload -U promptinit
@@ -58,6 +67,8 @@
       '')
     ];
     autocd = true;
+    autosuggestion.enable = true;
+    defaultKeymap = "viins";
     history = {
       ignoreAllDups = true;
       extended = true;
diff --git a/roles/home-manager/terminal.nix b/roles/home-manager/terminal.nix
index c165944..8ffbb16 100644
--- a/roles/home-manager/terminal.nix
+++ b/roles/home-manager/terminal.nix
@@ -8,8 +8,8 @@
     ./minimal-terminal.nix
     ../../modules/home-manager/terminal/nushell
     ../../modules/home-manager/terminal/starship.nix
-    ../../modules/home-manager/terminal/voice.nix
     ../../modules/home-manager/terminal/tiny-irc.nix
+    ../../modules/home-manager/nvim
   ];
   home.packages = with pkgs; [
     tre-command