diff --git a/flake.lock b/flake.lock
index bd2c7d2..46ac38f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "lastModified": 1736373539,
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740603184,
-        "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
+        "lastModified": 1739055578,
+        "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49",
+        "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e",
         "type": "github"
       },
       "original": {
@@ -47,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740569341,
-        "narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=",
+        "lastModified": 1736549395,
+        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
         "owner": "pjones",
         "repo": "plasma-manager",
-        "rev": "5eeb0172fb74392053b66a8149e61b5e191b2845",
+        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 6299428..c0153ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,6 +75,7 @@
         };
         modules = [
           ./machines/solis/configuration.nix
+          home-manager.nixosModules.home-manager
           sops-nix.nixosModules.sops
         ];
       };
diff --git a/modules/default.nix b/modules/default.nix
index 5a0eef5..3c57b26 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,7 +4,7 @@
     ./hardware
     ./network
     ./terminal
-    ( if !headless then ./wm else ./empty.nix )
+    ./wm
     ./users
     ./boot
     ./base
diff --git a/modules/wm/plasma/default.nix b/modules/wm/plasma/default.nix
index 8e9d519..0c91488 100644
--- a/modules/wm/plasma/default.nix
+++ b/modules/wm/plasma/default.nix
@@ -4,6 +4,7 @@
   lib,
   config,
   pkgs,
+  headless,
   ...
 }: let
   inherit (lib) mkEnableOption mkIf mkOption types;
@@ -33,8 +34,8 @@ in {
       konsole
     ];
 
-    home-manager.users.${homeCfg.username} = {
+    home-manager.users.${homeCfg.username} = lib.mkIf (!headless) {
       imports = [./config.nix];
-    };
+    }; 
   };
 }