diff --git a/flake.nix b/flake.nix
index e7d4f3b..85670e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,14 +72,6 @@
       ...
     }:
     let
-      # All systems we want to support for the generic VM
-      # to run the vm:
-      # nixos-rebuild build-vm --flake ~/nix#$(nix eval --raw --impure --expr 'builtins.currentSystem')
-      supportedSystems = [
-        "x86_64-linux"
-        "aarch64-linux"
-      ];
-
       # Shared config for all package sets
       pkgConfig = {
         allowUnfree = true;
@@ -139,11 +131,6 @@
                     "root"
                     "sckova"
                   ];
-
-                  # Increase file descriptor limit for builds
-                  # sandbox = "relaxed";
-                  # extra-sandbox-paths = [ ];
-                  # build-users-group = "nixbld";
                 };
 
                 gc = {
@@ -170,9 +157,10 @@
                 ];
               };
             }
+            ./options.nix
             ./system
             ./system/searxng
-            ./system/torrenting
+            ./system/games
             ./system/widevine
             ./system/shell/fish.nix
             ./system/tailscale
@@ -189,12 +177,13 @@
                   imports = [
                     ./home
                     ./options.nix
-                    ./home/apps
-                    ./home/games
-                    ./home/hosts/${hostname}
-                    ./home/services
-                    ./home/terminal
-                    ./home/tiling
+                    ./home/sckova
+                    ./home/sckova/apps
+                    ./home/sckova/games
+                    ./home/sckova/hosts/${hostname}
+                    ./home/sckova/services
+                    ./home/sckova/terminal
+                    ./home/sckova/tiling
                   ];
                 };
                 sharedModules = [
@@ -238,8 +227,8 @@
           home.username = user;
           home.homeDirectory = "/home/${user}";
           modules = [
-            ./home
-            ./home/hosts/${hostname}.nix
+            ./home/${user}
+            ./home/${user}/hosts/${hostname}.nix
             home-manager.homeModules.home-manager
             niri.homeModules.default
             noctalia.homeModules.noctalia
@@ -266,14 +255,7 @@
             }
           ];
         };
-      }
-      // nixpkgs.lib.genAttrs supportedSystems (
-        system:
-        mkNixosSystem {
-          hostname = "vm-generic";
-          inherit system;
-        }
-      );
+      };
 
       homeConfigurations = {
         peach = mkHomeConfig {
@@ -286,14 +268,6 @@
           hostname = "alien";
           system = "x86_64-linux";
         };
-      }
-      // nixpkgs.lib.genAttrs supportedSystems (
-        system:
-        mkHomeConfig {
-          user = "sckova";
-          hostname = "vm-generic";
-          inherit system;
-        }
-      );
+      };
     };
 }
diff --git a/home/hosts/vm-generic/default.nix b/home/hosts/vm-generic/default.nix
deleted file mode 100644
index 6572e4a..0000000
--- a/home/hosts/vm-generic/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-{
-  colors = {
-    scheme = "catppuccin-mocha";
-    accent = "base0B";
-  };
-}
diff --git a/home/apps/default.nix b/home/sckova/apps/default.nix
similarity index 100%
rename from home/apps/default.nix
rename to home/sckova/apps/default.nix
diff --git a/home/apps/discord.nix b/home/sckova/apps/discord.nix
similarity index 100%
rename from home/apps/discord.nix
rename to home/sckova/apps/discord.nix
diff --git a/home/apps/firefox.nix b/home/sckova/apps/firefox.nix
similarity index 100%
rename from home/apps/firefox.nix
rename to home/sckova/apps/firefox.nix
diff --git a/home/apps/firefox_css/theme/hide.css b/home/sckova/apps/firefox_css/theme/hide.css
similarity index 100%
rename from home/apps/firefox_css/theme/hide.css
rename to home/sckova/apps/firefox_css/theme/hide.css
diff --git a/home/apps/firefox_css/theme/theme-new.css b/home/sckova/apps/firefox_css/theme/theme-new.css
similarity index 100%
rename from home/apps/firefox_css/theme/theme-new.css
rename to home/sckova/apps/firefox_css/theme/theme-new.css
diff --git a/home/apps/firefox_css/theme/theme.css b/home/sckova/apps/firefox_css/theme/theme.css
similarity index 100%
rename from home/apps/firefox_css/theme/theme.css
rename to home/sckova/apps/firefox_css/theme/theme.css
diff --git a/home/apps/firefox_css/userChrome.css b/home/sckova/apps/firefox_css/userChrome.css
similarity index 100%
rename from home/apps/firefox_css/userChrome.css
rename to home/sckova/apps/firefox_css/userChrome.css
diff --git a/home/apps/mpv.nix b/home/sckova/apps/mpv.nix
similarity index 100%
rename from home/apps/mpv.nix
rename to home/sckova/apps/mpv.nix
diff --git a/home/apps/vencord.nix b/home/sckova/apps/vencord.nix
similarity index 100%
rename from home/apps/vencord.nix
rename to home/sckova/apps/vencord.nix
diff --git a/home/apps/vscode.nix b/home/sckova/apps/vscode.nix
similarity index 100%
rename from home/apps/vscode.nix
rename to home/sckova/apps/vscode.nix
diff --git a/home/sckova/default.nix b/home/sckova/default.nix
new file mode 100644
index 0000000..f507113
--- /dev/null
+++ b/home/sckova/default.nix
@@ -0,0 +1,8 @@
+{
+  # the user to activate
+  userOptions = {
+    name = "Sean Kovacs";
+    username = "sckova";
+    email = "kovacsmillio@gmail.com";
+  };
+}
diff --git a/home/games/default.nix b/home/sckova/games/default.nix
similarity index 100%
rename from home/games/default.nix
rename to home/sckova/games/default.nix
diff --git a/home/games/minecraft.nix b/home/sckova/games/minecraft.nix
similarity index 100%
rename from home/games/minecraft.nix
rename to home/sckova/games/minecraft.nix
diff --git a/home/games/morrowind.nix b/home/sckova/games/morrowind.nix
similarity index 100%
rename from home/games/morrowind.nix
rename to home/sckova/games/morrowind.nix
diff --git a/home/hosts/alien/default.nix b/home/sckova/hosts/alien/default.nix
similarity index 100%
rename from home/hosts/alien/default.nix
rename to home/sckova/hosts/alien/default.nix
diff --git a/home/hosts/peach/default.nix b/home/sckova/hosts/peach/default.nix
similarity index 100%
rename from home/hosts/peach/default.nix
rename to home/sckova/hosts/peach/default.nix
diff --git a/home/services/default.nix b/home/sckova/services/default.nix
similarity index 100%
rename from home/services/default.nix
rename to home/sckova/services/default.nix
diff --git a/home/services/gtk.nix b/home/sckova/services/gtk.nix
similarity index 100%
rename from home/services/gtk.nix
rename to home/sckova/services/gtk.nix
diff --git a/home/services/qt.nix b/home/sckova/services/qt.nix
similarity index 100%
rename from home/services/qt.nix
rename to home/sckova/services/qt.nix
diff --git a/home/services/systemd.nix b/home/sckova/services/systemd.nix
similarity index 100%
rename from home/services/systemd.nix
rename to home/sckova/services/systemd.nix
diff --git a/home/terminal/btop.conf b/home/sckova/terminal/btop.conf
similarity index 100%
rename from home/terminal/btop.conf
rename to home/sckova/terminal/btop.conf
diff --git a/home/terminal/btop.nix b/home/sckova/terminal/btop.nix
similarity index 100%
rename from home/terminal/btop.nix
rename to home/sckova/terminal/btop.nix
diff --git a/home/terminal/default.nix b/home/sckova/terminal/default.nix
similarity index 100%
rename from home/terminal/default.nix
rename to home/sckova/terminal/default.nix
diff --git a/home/terminal/fish.nix b/home/sckova/terminal/fish.nix
similarity index 100%
rename from home/terminal/fish.nix
rename to home/sckova/terminal/fish.nix
diff --git a/home/terminal/fish_functions/fish-prompt.fish b/home/sckova/terminal/fish_functions/fish-prompt.fish
similarity index 100%
rename from home/terminal/fish_functions/fish-prompt.fish
rename to home/sckova/terminal/fish_functions/fish-prompt.fish
diff --git a/home/terminal/fish_functions/kitty-ssh.fish b/home/sckova/terminal/fish_functions/kitty-ssh.fish
similarity index 100%
rename from home/terminal/fish_functions/kitty-ssh.fish
rename to home/sckova/terminal/fish_functions/kitty-ssh.fish
diff --git a/home/terminal/fish_functions/nix-shell.fish b/home/sckova/terminal/fish_functions/nix-shell.fish
similarity index 100%
rename from home/terminal/fish_functions/nix-shell.fish
rename to home/sckova/terminal/fish_functions/nix-shell.fish
diff --git a/home/terminal/kitty.nix b/home/sckova/terminal/kitty.nix
similarity index 100%
rename from home/terminal/kitty.nix
rename to home/sckova/terminal/kitty.nix
diff --git a/home/terminal/neovim.nix b/home/sckova/terminal/neovim.nix
similarity index 100%
rename from home/terminal/neovim.nix
rename to home/sckova/terminal/neovim.nix
diff --git a/home/tiling/default.nix b/home/sckova/tiling/default.nix
similarity index 100%
rename from home/tiling/default.nix
rename to home/sckova/tiling/default.nix
diff --git a/home/tiling/niri.nix b/home/sckova/tiling/niri.nix
similarity index 100%
rename from home/tiling/niri.nix
rename to home/sckova/tiling/niri.nix
diff --git a/home/tiling/noctalia.nix b/home/sckova/tiling/noctalia.nix
similarity index 99%
rename from home/tiling/noctalia.nix
rename to home/sckova/tiling/noctalia.nix
index a083222..b88701c 100644
--- a/home/tiling/noctalia.nix
+++ b/home/sckova/tiling/noctalia.nix
@@ -348,7 +348,7 @@
         animationDisabled = false;
         animationSpeed = 1;
         autoStartAuth = false;
-        avatarImage = "/home/sckova/.face";
+        avatarImage = "/home/${config.userOptions.username}/.face";
         boxRadiusRatio = 1;
         clockFormat = "hh\\nmm";
         clockStyle = "custom";
@@ -559,7 +559,7 @@
 
       wallpaper = {
         automationEnabled = false;
-        directory = "/home/sckova/.local/share/wallpaper";
+        directory = "/home/${config.userOptions.username}/.local/share/wallpaper";
         enableMultiMonitorDirectories = false;
         enabled = false;
         fillColor = "#1e1e2e";
diff --git a/home/tiling/wallpaper.nix b/home/sckova/tiling/wallpaper.nix
similarity index 100%
rename from home/tiling/wallpaper.nix
rename to home/sckova/tiling/wallpaper.nix
diff --git a/options.nix b/options.nix
index 0f62b2b..94e6dfa 100644
--- a/options.nix
+++ b/options.nix
@@ -19,24 +19,24 @@
     userOptions = {
       name = lib.mkOption {
         type = lib.types.str;
-        readOnly = true;
+        readOnly = false;
         default = "Sean Kovacs";
       };
       username = lib.mkOption {
         type = lib.types.str;
-        readOnly = true;
+        readOnly = false;
         default = "sckova";
       };
+      email = lib.mkOption {
+        type = lib.types.str;
+        readOnly = false;
+        default = "kovacsmillio@gmail.com";
+      };
       hostname = lib.mkOption {
         type = lib.types.str;
         readOnly = true;
         default = config.system.name;
       };
-      email = lib.mkOption {
-        type = lib.types.str;
-        readOnly = true;
-        default = "kovacsmillio@gmail.com";
-      };
       fontSans = {
         name = lib.mkOption {
           type = lib.types.str;
diff --git a/system/default.nix b/system/default.nix
index e6a4f03..c6c6b5f 100755
--- a/system/default.nix
+++ b/system/default.nix
@@ -7,6 +7,13 @@
   ...
 }:
 {
+  # the user to activate
+  userOptions = {
+    name = "Sean Kovacs";
+    username = "sckova";
+    email = "kovacsmillio@gmail.com";
+  };
+
   boot = {
     plymouth.enable = true;
     plymouth.logo = "${pkgs.nixos-icons}/share/icons/hicolor/64x64/apps/nix-snowflake-white.png";
@@ -49,19 +56,6 @@
   };
 
   programs = {
-    gamescope = {
-      enable = true;
-      capSysNice = false;
-      args = [
-        "--output-width 3840"
-        "--nested-width 3840"
-        "--output-height 2160"
-        "--nested-height 2160"
-        "--expose-wayland"
-        "--fullscreen"
-      ];
-    };
-    gamemode.enable = true;
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
@@ -107,7 +101,7 @@
   services = {
     displayManager = {
       autoLogin.enable = true;
-      autoLogin.user = "sckova";
+      autoLogin.user = config.userOptions.username;
       defaultSession = "niri";
       sddm.enable = true;
       sddm.wayland.enable = true;
@@ -128,17 +122,6 @@
     upower.enable = true;
     power-profiles-daemon.enable = true;
     openssh.enable = true;
-    ananicy = {
-      enable = true;
-      package = pkgs.ananicy-cpp;
-      rulesProvider = pkgs.ananicy-cpp;
-      extraRules = [
-        {
-          "name" = "gamescope";
-          "nice" = -20;
-        }
-      ];
-    };
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/system/games/default.nix b/system/games/default.nix
new file mode 100644
index 0000000..cbe1d88
--- /dev/null
+++ b/system/games/default.nix
@@ -0,0 +1,37 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  programs = {
+    gamescope = {
+      enable = true;
+      capSysNice = false;
+      args = [
+        "--output-width 3840"
+        "--nested-width 3840"
+        "--output-height 2160"
+        "--nested-height 2160"
+        "--expose-wayland"
+        "--fullscreen"
+      ];
+    };
+    gamemode.enable = true;
+  };
+
+  services = {
+    ananicy = {
+      enable = true;
+      package = pkgs.ananicy-cpp;
+      rulesProvider = pkgs.ananicy-cpp;
+      extraRules = [
+        {
+          "name" = "gamescope";
+          "nice" = -20;
+        }
+      ];
+    };
+  };
+}
diff --git a/system/hosts/alien/default.nix b/system/hosts/alien/default.nix
index db709fe..7ba7577 100644
--- a/system/hosts/alien/default.nix
+++ b/system/hosts/alien/default.nix
@@ -17,7 +17,7 @@
   ];
 
   # enable ddcutil
-  users.users.sckova.extraGroups = [ "i2c" ];
+  users.users.${config.userOptions.username}.extraGroups = [ "i2c" ];
   boot.extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
   boot.kernelModules = [
     "i2c-dev"
@@ -78,7 +78,7 @@
   # i don't even remember what this does or why i added it
   systemd.tmpfiles.rules = [
     "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware"
-    "d /mnt/storage 0775 sckova users - -"
+    "d /mnt/storage 0775 ${config.userOptions.username} users - -"
   ];
 
   services.factorio = {
@@ -90,6 +90,6 @@
     # bind = "[::]"; # support IPv6
     game-name = "kova's minecraft";
     game-password = "ThisIsASuperSecurePasswordThatNobodyWillGuess";
-    admins = [ "sckova" ];
+    admins = [ config.userOptions.username ];
   };
 }
diff --git a/system/hosts/peach/default.nix b/system/hosts/peach/default.nix
index 8c9f53e..22394cc 100644
--- a/system/hosts/peach/default.nix
+++ b/system/hosts/peach/default.nix
@@ -1,4 +1,5 @@
 {
+  config,
   pkgs,
   lib,
   ...
@@ -46,7 +47,7 @@ in
       setSocketVariable = true;
     };
   };
-  users.users.sckova.extraGroups = [ "docker" ];
+  users.users.${config.userOptions.username}.extraGroups = [ "docker" ];
 
   hardware.asahi = {
     enable = true;
diff --git a/system/hosts/vm-generic/default.nix b/system/hosts/vm-generic/default.nix
deleted file mode 100644
index ef46a45..0000000
--- a/system/hosts/vm-generic/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ ... }:
-{
-  home-manager.users.sckova = {
-    imports = [ ];
-  };
-
-  services.spice-vdagentd.enable = true;
-
-  virtualisation.vmVariant = {
-    virtualisation = {
-      memorySize = 8192;
-      cores = 6;
-    };
-  };
-
-  security.sudo.wheelNeedsPassword = false;
-}
diff --git a/system/torrenting/default.nix b/system/torrenting/default.nix
deleted file mode 100644
index 2a59d85..0000000
--- a/system/torrenting/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-{
-  users.users.sckova.extraGroups = [ "qbittorrent" ];
-  services = {
-    qbittorrent = {
-      enable = false;
-      serverConfig = {
-        Preferences = {
-          Advanced.useSystemIconTheme = true;
-          General = {
-            CloseToTray = false;
-            CloseToTrayNotified = true;
-            ExitConfirm = false;
-            Locale = "en";
-          };
-          WebUI = {
-            Address = "*";
-            Enabled = true;
-            Port = 9697;
-            UseUPnP = false;
-          };
-          BitTorrent = {
-            SessionGlobalDLSpeedLimit = 0;
-            GlobalUPSpeedLimit = 0;
-            Port = 42578;
-            QueueingSystemEnabled = false;
-            SSL.Port = 63114;
-            StartPaused = false;
-          };
-        };
-      };
-    };
-    flaresolverr = {
-      enable = true;
-      port = 8191;
-    };
-    prowlarr = {
-      enable = true;
-      settings = {
-        server = {
-          urlbase = "localhost";
-          port = 9696;
-          bindaddress = "*";
-        };
-      };
-    };
-  };
-}