diff --git a/flake.nix b/flake.nix
index d41ac5e..3a67808 100644
--- a/flake.nix
+++ b/flake.nix
@@ -110,12 +110,7 @@
 
     overlays.x86_64-linux = final: prev: pkgList "x86_64-linux" prev.callPackage;
 
-    nixosConfigurations = let
-      commonHmModules = [
-        self.hmModules.minimal
-        ./home.nix
-      ];
-    in {
+    nixosConfigurations = {
       ZeNixLaptop = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
         modules = [
@@ -145,13 +140,12 @@
               pkgs,
               ...
             }: {
-              imports =
-                commonHmModules
-                ++ [
-                  self.hmModules.personal-cli
-                  self.hmModules.personal-gui
-                  self.hmModules.gaming
-                ];
+              imports = [
+                self.hmModules.minimal
+                self.hmModules.personal-cli
+                self.hmModules.personal-gui
+                self.hmModules.gaming
+              ];
             };
             home-manager.extraSpecialArgs = {
               flake = self;
@@ -193,15 +187,14 @@
               pkgs,
               ...
             }: {
-              imports =
-                commonHmModules
-                ++ [
-                  ./hostconfig/ZeNixComputa/hm.nix
-                  ./hostconfig/ZeNixComputa/extra_info.nix
-                  self.hmModules.personal-cli
-                  self.hmModules.personal-gui
-                  self.hmModules.gaming
-                ];
+              imports = [
+                self.hmModules.minimal
+                ./hostconfig/ZeNixComputa/hm.nix
+                ./hostconfig/ZeNixComputa/extra_info.nix
+                self.hmModules.personal-cli
+                self.hmModules.personal-gui
+                self.hmModules.gaming
+              ];
             };
             home-manager.extraSpecialArgs = {
               flake = self;
diff --git a/home.nix b/home.nix
deleted file mode 100644
index 2215e82..0000000
--- a/home.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  # This value determines the Home Manager release that your
-  # configuration is compatible with. This helps avoid breakage
-  # when a new Home Manager release introduces backwards
-  # incompatible changes.
-  #
-  # You can update Home Manager without changing this value. See
-  # the Home Manager release notes for a list of state version
-  # changes in each release.
-  home.stateVersion = "21.11";
-}
diff --git a/rustdev.nix b/rustdev.nix
deleted file mode 100644
index 802befc..0000000
--- a/rustdev.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  home.sessionVariables = {
-    RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache";
-  };
-
-  home.packages = with pkgs; [
-    pkgs.rust-bin.stable.latest.default
-    cargo-edit
-  ];
-
-  home.file = {
-    ".zfunc/_cargo".text = ''
-      #compdef cargo
-      if command -v rustc >/dev/null 2>&1; then
-      	source "$(rustc --print sysroot)"/share/zsh/site-functions/_cargo
-      fi
-    '';
-  };
-}