diff --git a/flake.nix b/flake.nix
index 0e8d5b5..9c3ff54 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,22 +53,8 @@
     # Standalone home-manager configuration entrypoint
     # Available through 'home-manager --flake .#your-username@your-hostname'
     homeConfigurations = {
-      "gabe@archlaptop" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-        extraSpecialArgs = {inherit inputs outputs;};
-        modules = [
-          ./hosts/gabe-archlaptop.nix
-          nixvim.homeManagerModules.nixvim
-        ];
-      };
-      "gabe@gv-workstation" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-        extraSpecialArgs = {inherit inputs outputs;};
-        modules = [
-          ./hosts/gabe-gv-workstation.nix
-          nixvim.homeManagerModules.nixvim
-        ];
-      };
+      "gabe@archlaptop" = import ./hosts/gabe-archlaptop.nix {inherit inputs outputs;};
+      "gabe@gv-workstation" = import ./hosts/gabe-gv-workstation.nix {inherit inputs outputs;};
     };
   };
 }
diff --git a/hosts/gabe-archlaptop.nix b/hosts/gabe-archlaptop.nix
index ab3a3c5..aa2694c 100644
--- a/hosts/gabe-archlaptop.nix
+++ b/hosts/gabe-archlaptop.nix
@@ -1,35 +1,47 @@
 {
-  config,
-  pkgs,
-  lib,
+  inputs,
+  outputs,
   ...
-}: {
-  # machine specific options
-  home = {
-    enable-speech = true;
-    nvim = {
-      enable-lsp = true;
-      enable-treesitter = true;
-    };
-    git = {
-      profile = {
-        name = "Gabe Venberg";
-        email = "gabevenberg@gmail.com";
+}:
+inputs.home-manager.lib.homeManagerConfiguration {
+  pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
+  extraSpecialArgs = {inherit inputs outputs;};
+  modules = [
+    ({
+      config,
+      pkgs,
+      lib,
+      ...
+    }: {
+      # machine specific options
+      home = {
+        enable-speech = true;
+        nvim = {
+          enable-lsp = true;
+          enable-treesitter = true;
+        };
+        git = {
+          profile = {
+            name = "Gabe Venberg";
+            email = "gabevenberg@gmail.com";
+          };
+          workProfile.enable = false;
+        };
       };
-      workProfile.enable = false;
-    };
-  };
 
-  targets.genericLinux.enable = true;
-  home.username = "gabe";
-  home.homeDirectory = /home/gabe;
-  imports = [
-    ../modules/home-manager/terminal
-    ../modules/home-manager/nvim
-    ../modules/home-manager
-    ../modules/home-manager/syncthing.nix
-    ../modules/home-manager/beets.nix
-    ../modules/home-manager/mpd/mpd.nix
-    ../modules/home-manager/email.nix
+      targets.genericLinux.enable = true;
+      home.username = "gabe";
+      home.homeDirectory = /home/gabe;
+      imports = [
+        ../modules/home-manager/terminal
+        ../modules/home-manager/nvim
+        ../modules/home-manager
+        ../modules/home-manager/syncthing.nix
+        ../modules/home-manager/beets.nix
+        ../modules/home-manager/mpd/mpd.nix
+        ../modules/home-manager/email.nix
+      ];
+    })
+    inputs.nixvim.homeManagerModules.nixvim
   ];
 }
diff --git a/hosts/gabe-gv-workstation.nix b/hosts/gabe-gv-workstation.nix
index 6e91e11..a0f008a 100644
--- a/hosts/gabe-gv-workstation.nix
+++ b/hosts/gabe-gv-workstation.nix
@@ -1,38 +1,50 @@
 {
-  config,
-  pkgs,
-  lib,
+  inputs,
+  outputs,
   ...
-}: {
-  # machine specific options
-  home = {
-    enable-speech = true;
-    nvim = {
-      enable-lsp = true;
-      enable-treesitter = true;
-    };
-    git = {
-      profile = {
-        name = "Gabe Venberg";
-        email = "gabevenberg@gmail.com";
+}:
+inputs.home-manager.lib.homeManagerConfiguration {
+  pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
+  extraSpecialArgs = {inherit inputs outputs;};
+  modules = [
+    inputs.nixvim.homeManagerModules.nixvim
+    ({
+      config,
+      pkgs,
+      lib,
+      ...
+    }: {
+      # machine specific options
+      home = {
+        enable-speech = true;
+        nvim = {
+          enable-lsp = true;
+          enable-treesitter = true;
+        };
+        git = {
+          profile = {
+            name = "Gabe Venberg";
+            email = "gabevenberg@gmail.com";
+          };
+          workProfile = {
+            enable = true;
+            email = "venberggabe@johndeere.com";
+          };
+        };
       };
-      workProfile = {
-        enable = true;
-        email = "venberggabe@johndeere.com";
-      };
-    };
-  };
 
-  targets.genericLinux.enable = true;
-  home.username = "gabe";
-  home.homeDirectory = /home/gabe;
-  imports = [
-    ../modules/home-manager/terminal
-    ../modules/home-manager/nvim
-    ../modules/home-manager
-    ../modules/home-manager/syncthing.nix
-    ../modules/home-manager/email.nix
-    ../modules/home-manager/beets.nix
-    ../modules/home-manager/mpd/mpd.nix
+      targets.genericLinux.enable = true;
+      home.username = "gabe";
+      home.homeDirectory = /home/gabe;
+      imports = [
+        ../modules/home-manager/terminal
+        ../modules/home-manager/nvim
+        ../modules/home-manager
+        ../modules/home-manager/syncthing.nix
+        ../modules/home-manager/email.nix
+        ../modules/home-manager/beets.nix
+        ../modules/home-manager/mpd/mpd.nix
+      ];
+    })
   ];
 }
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index c1fe84a..41d3d37 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -14,9 +14,15 @@
     lib.mkIf config.targets.genericLinux.enable
     {
       package = pkgs.nix;
-      settings.experimental-features = ["nix-command" "flakes"];
-      settings.max-jobs = "auto";
-      gc.automatic = true;
+      settings = {
+        experimental-features = ["nix-command" "flakes"];
+        max-jobs = "auto";
+      };
+      gc = {
+        automatic = true;
+        frequency = "weekly";
+        options = "--delete-older-than 30d";
+      };
     };
   imports = [
     ../hostopts.nix
diff --git a/modules/home-manager/nvim/spell/en.utf-8.add b/modules/home-manager/nvim/spell/en.utf-8.add
deleted file mode 100644
index 3827808..0000000
--- a/modules/home-manager/nvim/spell/en.utf-8.add
+++ /dev/null
@@ -1,52 +0,0 @@
-asciidoc
-ASCIISite
-asciidoctor
-ASCIIsite
-asciiDoc
-nextcloud
-filesystem
-zsh
-backend
-Incrementals
-incrementals
-Ransomware
-ransomware
-hypervisor
-offsite
-FTL
-superintelligent
-homeworld
-toolchain
-Kata
-ctl
-NDSU
-rebasing
-posix
-tmux
-keybinds
-dotfile
-dotfiles
-ctrl
-sed
-NGINX
-timezones
-Proxmox
-Gabe
-Venberg
-Github
-dotfiles
-config
-nvim
-neovim
-config
-Syncthing
-homelab
-microcontrollers
-nushell
-datatypes
-datetimes
-filesizes
-filetypes
-datastructures
-footguns
-csv
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index bc5077b..80fd949 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -13,6 +13,15 @@
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
+    optimise.automatic = true;
+    settings = {
+      auto-optimise-store = true;
+    };
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 30d";
+    };
   };
 
   # Allow unfree packages