diff --git a/modules/factory/users/user.nix b/modules/factory/users/user.nix
deleted file mode 100644
index 1d213da..0000000
--- a/modules/factory/users/user.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  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
new file mode 100644
index 0000000..e5681a0
--- /dev/null
+++ b/modules/firefox&helix.nix
@@ -0,0 +1,9 @@
+{inputs, ...}: {
+  flake.nixosModules.firefoxHelix = {pkgs, ...}: {
+    programs.firefox.enable = true;
+
+    environment.systemPackages = with pkgs; [
+      helix
+    ];
+  };
+}
diff --git a/modules/hosts/desktop/boot.nix b/modules/hosts/desktop/boot.nix
deleted file mode 100644
index d534ef6..0000000
--- a/modules/hosts/desktop/boot.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{pkgs, ...}: {
-  flake.modules.nixos.desktop = {
-    boot = {
-      kernelPackages = pkgs.linuxPackages_6_12;
-      kernelParams = ["nvidia-drm.modeset=1"];
-
-      loader.grub = {
-        enable = true;
-        device = "/dev/disk/by-id/ata-KINGSTON_SKC300S37A60G_50026B7239039148";
-      };
-    };
-  };
-}
diff --git a/modules/hosts/desktop/flake-parts.nix b/modules/hosts/desktop/flake-parts.nix
deleted file mode 100644
index 4e75add..0000000
--- a/modules/hosts/desktop/flake-parts.nix
+++ /dev/null
@@ -1 +0,0 @@
-{inputs, ...}: {flake.nixosConfigurations = inputs.self.lib.mkNixos "x86_64-linux" "desktop";}
diff --git a/modules/hosts/desktop/hardware.nix b/modules/hosts/desktop/hardware.nix
deleted file mode 100644
index 5c5726d..0000000
--- a/modules/hosts/desktop/hardware.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{config, ...}: {
-  flake.modules.nixos.desktop = {
-    nixpkgs.hostPlatform = "x86_64-linux";
-
-    hardware = {
-      graphics = {
-        enable = true;
-        enable32Bit = true;
-      };
-    };
-
-    nvidia = {
-      modesetting.enable = true;
-      powerManagement.enable = true;
-      open = false;
-      package = config.boot.kernelPackages.nvidiaPackages.production;
-    };
-  };
-}
diff --git a/modules/hosts/desktop/users/benDesktop.nix b/modules/hosts/desktop/users/benDesktop.nix
deleted file mode 100644
index fe2cad2..0000000
--- a/modules/hosts/desktop/users/benDesktop.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{self, ...}: {
-  flake.modules.nixos.desktop = {
-    imports = [
-      self.factory.benDesktop
-    ];
-  };
-}
diff --git a/modules/nix/flake-parts/factory.nix b/modules/nix/flake-parts/factory.nix
deleted file mode 100644
index 29c93f9..0000000
--- a/modules/nix/flake-parts/factory.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{lib, ...}: {
-  options.flake.factory = lib.mkOption {
-    type = lib.types.attrsof lib.types.unspecified;
-    default = {};
-  };
-}
diff --git a/modules/nix/flake-parts/lib.nix b/modules/nix/flake-parts/lib.nix
deleted file mode 100644
index 3708d7c..0000000
--- a/modules/nix/flake-parts/lib.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  inputs,
-  lib,
-  ...
-}: {
-  options.flake.lib = lib.mkOption {
-    type = lib.types.attrsOf lib.types.unspecified;
-    default = {};
-  };
-
-  config.flake.lib = {
-    mkNixos = system: name: {
-      ${name} = inputs.nixpkgs.lib.nixosSystem {
-        modules = [
-          inputs.self.modules.nixos.${name}
-          {nixpkgs.hostPlatform = lib.mkDefault system;}
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/users/benDesktop/benDesktop.nix b/modules/users/benDesktop/benDesktop.nix
deleted file mode 100644
index d6afc80..0000000
--- a/modules/users/benDesktop/benDesktop.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  self,
-  lib,
-  ...
-}: {
-  flake.modules = lib.mkMerge [
-    (self.factory.user "benDesktop")
-  ];
-}