diff --git a/modules/factory/users/user.nix b/modules/factory/users/user.nix
new file mode 100644
index 0000000..1d213da
--- /dev/null
+++ b/modules/factory/users/user.nix
@@ -0,0 +1,13 @@
+{
+  config.flake.factory.user = username: {
+    nixos."${username}" = {pkgs, ...}: {
+      users.users."${username}" = {
+        isNormalUser = true;
+        name = "${username}";
+      };
+      extraGroups = ["wheel"];
+
+      shell = pkgs.nushell;
+    };
+  };
+}
diff --git a/modules/firefox&helix.nix b/modules/firefox&helix.nix
deleted file mode 100644
index e5681a0..0000000
--- a/modules/firefox&helix.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{inputs, ...}: {
-  flake.nixosModules.firefoxHelix = {pkgs, ...}: {
-    programs.firefox.enable = true;
-
-    environment.systemPackages = with pkgs; [
-      helix
-    ];
-  };
-}
diff --git a/modules/nix/flake-parts/factory.nix b/modules/nix/flake-parts/factory.nix
new file mode 100644
index 0000000..29c93f9
--- /dev/null
+++ b/modules/nix/flake-parts/factory.nix
@@ -0,0 +1,6 @@
+{lib, ...}: {
+  options.flake.factory = lib.mkOption {
+    type = lib.types.attrsof lib.types.unspecified;
+    default = {};
+  };
+}
diff --git a/modules/users/benDesktop/benDesktop.nix b/modules/users/benDesktop/benDesktop.nix
new file mode 100644
index 0000000..d6afc80
--- /dev/null
+++ b/modules/users/benDesktop/benDesktop.nix
@@ -0,0 +1,9 @@
+{
+  self,
+  lib,
+  ...
+}: {
+  flake.modules = lib.mkMerge [
+    (self.factory.user "benDesktop")
+  ];
+}