diff --git a/flake.nix b/flake.nix
index 782c0ab..4241a9d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,8 @@
       ) {}
       colors;
   in {
+    homeManagerModules.default = ./modules/home/default.nix;
+
     nixosConfigurations = {
       oganesson = nixpkgs.lib.nixosSystem {
         specialArgs = {
@@ -75,8 +77,8 @@
         };
         inherit system;
         modules = [
-          ./hosts/desktop
-          ./modules
+          ./hosts/desktop/config.nix
+          ./modules/sys
           stylix.nixosModules.stylix
           nixvim.nixosModules.nixvim
           nur.nixosModules.nur
@@ -89,8 +91,8 @@
           inherit self inputs scheme wallpaper username;
         };
         modules = [
-          ./hosts/laptop
-          ./modules
+          ./hosts/laptop/config.nix
+          ./modules/sys
           stylix.nixosModules.stylix
           nixvim.nixosModules.nixvim
           nur.nixosModules.nur
diff --git a/hosts/desktop/config.nix b/hosts/desktop/config.nix
index c9bfa9f..b4fe253 100644
--- a/hosts/desktop/config.nix
+++ b/hosts/desktop/config.nix
@@ -1,7 +1,10 @@
 {pkgs, ...}: {
   system.stateVersion = "24.05";
   nixpkgs.config.allowUnfree = true;
-  imports = [ ./hardware.nix ];
+  imports = [
+    ./hardware.nix
+    ./home.nix
+  ];
   nix = {
     settings = {
       auto-optimise-store = true;
diff --git a/modules/home/home-manager.nix b/hosts/desktop/home.nix
similarity index 58%
rename from modules/home/home-manager.nix
rename to hosts/desktop/home.nix
index 28f2f71..0deb437 100644
--- a/modules/home/home-manager.nix
+++ b/hosts/desktop/home.nix
@@ -5,12 +5,12 @@
   inputs,
   username,
   wallpaper,
+  lib,
   scheme,
   config,
   ...
 }: let
   nur = config.nur;
-  desktop = (host == "oganesson");
 in {
   imports = [inputs.home-manager.nixosModules.home-manager];
   home-manager = {
@@ -18,22 +18,24 @@ in {
     useGlobalPkgs = true;
     backupFileExtension = "backup";
     extraSpecialArgs = {inherit self inputs host wallpaper scheme username nur;};
-    users.${username} = {
-      dconf.settings = if desktop then {
-        "org/virt-manager/virt-manager/connections" = {
-          autoconnect = ["qemu:///system"];
-          uris = ["qemu:///system"];
+    users = {
+      ${username} = {
+        imports = [
+          inputs.spicetify-nix.homeManagerModules.default
+          inputs.self.outputs.homeManagerModules.default
+        ];
+        dconf.settings = lib.mkIf config.virtOpts.enable {
+          "org/virt-manager/virt-manager/connections" = {
+            autoconnect = ["qemu:///system"];
+            uris = ["qemu:///system"];
+          };
+        };
+        programs.home-manager.enable = true;
+        home = {
+          username = "${username}";
+          homeDirectory = "/home/${username}";
+          stateVersion = "24.05";
         };
-      } else {};
-      programs.home-manager.enable = true;
-      imports = [
-        inputs.spicetify-nix.homeManagerModules.default
-        ./hm-modules.nix
-      ];
-      home = {
-        username = "${username}";
-        homeDirectory = "/home/${username}";
-        stateVersion = "24.05";
       };
     };
   };
diff --git a/modules/default.nix b/modules/default.nix
deleted file mode 100644
index 675df72..0000000
--- a/modules/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  inputs,
-  nixpkgs,
-  config,
-  self,
-  username,
-  host,
-  lib,
-  ...
-}: {
-  imports = [
-    ./sys/hardware
-    ./sys/software
-    ./sys/environment
-    ./home/home-manager.nix
-  ];
-
-  networkModule.enable = lib.mkDefault true;
-  nixSettings.enable = lib.mkDefault true;
-  bootLoader.enable = lib.mkDefault true;
-  issue.enable = lib.mkDefault true;
-  sddmOpts.enable = lib.mkDefault true;
-  stylixOpts.enable = lib.mkDefault true;
-  gamingPkgs.enable = lib.mkDefault true;
-  steamOpts.enable = lib.mkDefault true;
-  sysPkgs.enable = lib.mkDefault true;
-  sysProgs.enable = lib.mkDefault true;
-  sysServices.enable = lib.mkDefault true;
-  virtOpts.enable = lib.mkDefault true;
-  powerProfiles.enable = lib.mkDefault false;
-}
diff --git a/modules/home/hm-modules.nix b/modules/home/default.nix
similarity index 100%
rename from modules/home/hm-modules.nix
rename to modules/home/default.nix
diff --git a/modules/sys/default.nix b/modules/sys/default.nix
index 81c1de4..f64d5a4 100644
--- a/modules/sys/default.nix
+++ b/modules/sys/default.nix
@@ -5,12 +5,26 @@
   self,
   username,
   host,
+  lib,
   ...
 }: {
   imports = [
     ./hardware
     ./software
     ./environment
-    ../home/home-manager.nix
   ];
+
+  networkModule.enable = lib.mkDefault true;
+  nixSettings.enable = lib.mkDefault true;
+  bootLoader.enable = lib.mkDefault true;
+  issue.enable = lib.mkDefault true;
+  sddmOpts.enable = lib.mkDefault true;
+  stylixOpts.enable = lib.mkDefault true;
+  gamingPkgs.enable = lib.mkDefault true;
+  steamOpts.enable = lib.mkDefault true;
+  sysPkgs.enable = lib.mkDefault true;
+  sysProgs.enable = lib.mkDefault true;
+  sysServices.enable = lib.mkDefault true;
+  virtOpts.enable = lib.mkDefault true;
+  powerProfiles.enable = lib.mkDefault false;
 }
diff --git a/modules/sys/environment/default.nix b/modules/sys/environment/default.nix
index 2f70861..0447f39 100644
--- a/modules/sys/environment/default.nix
+++ b/modules/sys/environment/default.nix
@@ -11,5 +11,6 @@
   imports =
     [(import ./sddm.nix)]
     ++ [(import ./issue.nix)]
+    ++ [(import ./nix.nix)]
     ++ [(import ./stylix.nix)];
 }
diff --git a/modules/sys/hardware/powerprofiles.nix b/modules/sys/hardware/powerprofiles.nix
index 1ff26b9..0b686b2 100644
--- a/modules/sys/hardware/powerprofiles.nix
+++ b/modules/sys/hardware/powerprofiles.nix
@@ -49,3 +49,4 @@
       };
     };
   };
+}