diff --git a/flake.nix b/flake.nix
index bf560ba..adcc909 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,10 +12,8 @@
     formatter.x86_64-linux = pkgs.alejandra;
 
     packages = eachSystem (
-      system: let
-        user = import ./modules/user {pkgs = pkgsFor.${system};};
-      in {
-        inherit (user) packages;
+      system: {
+        inherit (import ./packages pkgsFor.${system}) helix fish;
       }
     );
 
@@ -31,11 +29,11 @@
         program = "${user.packages.helix}/bin/hx";
       };
     });
-    nixosModules = eachSystem (system: let
-      user = import ./modules/user {pkgs = pkgsFor.${system};};
-    in {
-      user = user.module;
-    });
+    # nixosModules = eachSystem (system: let
+    #   user = import ./modules/user {inherit inputs;};
+    # in {
+    #   user = user.module;
+    # });
   };
   inputs = {
     # Unstable nixpkgs baby!
diff --git a/hosts/default.nix b/hosts/default.nix
index 1a2c17a..c8a34df 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -27,7 +27,7 @@ inputs: let
         # This is used to pre-emptively set the hostPlatform for nixpkgs.
         # Also, we set the system hostname here.
         [
-          self.nixosModules.user
+          # self.nixosModules.user
         ]
         (singleton {
           networking.hostName = hostname;
diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix
index fd9442b..dba8834 100644
--- a/hosts/hermit/programs.nix
+++ b/hosts/hermit/programs.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  self,
+  pkgs,
+  ...
+}: {
   environment.systemPackages = builtins.attrValues {
     inherit
       (pkgs)
@@ -87,5 +91,6 @@
       zip
       zoxide
       ;
+    inherit (self.packages.${pkgs.stdenv.system}) helix;
   };
 }
diff --git a/modules/user/default.nix b/modules/user/default.nix
index 3ee98f7..582fb82 100644
--- a/modules/user/default.nix
+++ b/modules/user/default.nix
@@ -1,13 +1,4 @@
-{pkgs, ...}: rec {
-  packages = {
-    fish = pkgs.callPackage ./shell {};
-    helix = pkgs.callPackage ./helix {};
-    kakoune = pkgs.callPackage ./kakoune {};
-  };
-  shell = pkgs.mkShell {
-    name = "bloxx-shell";
-    buildInputs = [packages.fish];
-  };
+{, ...}: rec {
   module = {
     config = {
       environment.sessionVariables.EDITOR = "hx";
diff --git a/packages/default.nix b/packages/default.nix
new file mode 100644
index 0000000..804b9e7
--- /dev/null
+++ b/packages/default.nix
@@ -0,0 +1,7 @@
+pkgs: let
+  helix = pkgs.callPackage ./helix.nix {};
+  kakoune = null;
+  fish = pkgs.callPackage ./shell {};
+in {
+  inherit helix kakoune fish;
+}
diff --git a/modules/user/helix/default.nix b/packages/helix.nix
similarity index 100%
rename from modules/user/helix/default.nix
rename to packages/helix.nix
diff --git a/modules/user/kakoune/default.nix b/packages/kakoune.nix
similarity index 100%
rename from modules/user/kakoune/default.nix
rename to packages/kakoune.nix
diff --git a/modules/user/shell/aliases.nix b/packages/shell/aliases.nix
similarity index 100%
rename from modules/user/shell/aliases.nix
rename to packages/shell/aliases.nix
diff --git a/modules/user/shell/config.fish b/packages/shell/config.fish
similarity index 100%
rename from modules/user/shell/config.fish
rename to packages/shell/config.fish
diff --git a/modules/user/shell/default.nix b/packages/shell/default.nix
similarity index 100%
rename from modules/user/shell/default.nix
rename to packages/shell/default.nix
diff --git a/modules/user/shell/fish-on-tmpfs.patch b/packages/shell/fish-on-tmpfs.patch
similarity index 100%
rename from modules/user/shell/fish-on-tmpfs.patch
rename to packages/shell/fish-on-tmpfs.patch
diff --git a/modules/user/shell/fishinit.nix b/packages/shell/fishinit.nix
similarity index 100%
rename from modules/user/shell/fishinit.nix
rename to packages/shell/fishinit.nix
diff --git a/modules/user/shell/packages.nix b/packages/shell/packages.nix
similarity index 100%
rename from modules/user/shell/packages.nix
rename to packages/shell/packages.nix
diff --git a/modules/user/shell/starship.nix b/packages/shell/starship.nix
similarity index 100%
rename from modules/user/shell/starship.nix
rename to packages/shell/starship.nix