diff --git a/home-manager/default.nix b/home-manager/default.nix
index 6049ddc2..a478f237 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,18 +1,4 @@
 { lib, config, pkgs, inputs, hostname, platform, username, desktop, theme, hmStateVersion, ... }: {
-
-  home = {
-    inherit username;
-    stateVersion = hmStateVersion;
-    homeDirectory = "/home/${username}";
-    sessionPath = [ "$HOME/.local/bin" ];
-    pointerCursor = {
-      gtk.enable = true;
-      package = pkgs.catppuccin-cursors.mochaLight;
-      name = "Catppuccin-Mocha-Light-Cursors";
-      size = 22;
-    };
-  };
-
   imports = [ 
     # Doom-Emacs input import
     inputs.doom-emacs.hmModule
@@ -27,6 +13,19 @@
   ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop}             # Machine-agnostic desktop configs
   ++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop}  # Machine-specific desktop configs
   ;
+
+  home = {
+    inherit username;
+    stateVersion = hmStateVersion;
+    homeDirectory = "/home/${username}";
+    sessionPath = [ "$HOME/.local/bin" ];
+    pointerCursor = {
+      gtk.enable = true;
+      package = pkgs.catppuccin-cursors.mochaLight;
+      name = "Catppuccin-Mocha-Light-Cursors";
+      size = 22;
+    };
+  };
   
   nixpkgs = {
     overlays = [
diff --git a/lib/default.nix b/lib/default.nix
index f0910e39..a12f25e8 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -11,7 +11,7 @@
     pkgs = inputs.nixpkgs.legacyPackages.${platform};
     extraSpecialArgs = { inherit inputs outputs desktop hostname platform username hmStateVersion theme; };
     modules = [ 
-      ../home-manager 
+      ../home-manager dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
     ];
   };
 
@@ -52,6 +52,7 @@
       inputs.sops-nix.nixosModules.sops
       inputs.lanzaboote.nixosModules.lanzaboote
       inputs.home-manager.nixosModules.home-manager {
+        extraSpecialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu platform theme format; };
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
         home-manager.users."$username" = import ../home-manager;