diff --git a/modules/home/desktop/common/default.nix b/modules/home/desktop/common/default.nix
index 9974475..f7e9be4 100644
--- a/modules/home/desktop/common/default.nix
+++ b/modules/home/desktop/common/default.nix
@@ -1,5 +1,4 @@
 {
   imports = [
-    ./xdg-userdirs.nix
   ];
 }
diff --git a/modules/home/desktop/common/xdg-userdirs.nix b/modules/home/desktop/common/xdg-userdirs.nix
deleted file mode 100644
index b9e6c16..0000000
--- a/modules/home/desktop/common/xdg-userdirs.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{config, ...}: let
-  inherit (config.home) homeDirectory;
-  home = f: "${homeDirectory}/${f}";
-in {
-  xdg.userDirs = {
-    enable = true;
-    createDirectories = true;
-    templates = home "temps";
-    publicShare = home "pub";
-    desktop = home "desktop";
-    download = home "downloads";
-    documents = home "docs";
-    pictures = home "pics";
-    videos = home "vids";
-    music = home "music";
-  };
-}
diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
index 17ea96f..d6b57d9 100644
--- a/modules/home/desktop/default.nix
+++ b/modules/home/desktop/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ./common
+    # ./common
     ./cosmic
     ./gnome
     ./hyprland
diff --git a/modules/shared/user/common.nix b/modules/shared/user/common.nix
index 71c96e3..e8b74c5 100644
--- a/modules/shared/user/common.nix
+++ b/modules/shared/user/common.nix
@@ -1,4 +1,5 @@
 {
+  config,
   inputs,
   osConfig,
   ...
@@ -8,7 +9,27 @@
     self.homeModules.desktop
     self.homeModules.programs
   ];
+
   inherit (osConfig) desktop;
-  home.stateVersion = osConfig.system.stateVersion;
-  home.sessionPath = ["$HOME/.local/bin"];
+
+  home = {
+    inherit (osConfig.system) stateVersion;
+    sessionPath = ["$HOME/.local/bin"];
+  };
+
+  xdg.userDirs = let
+    inherit (config.home) homeDirectory;
+    homeDir = f: "${homeDirectory}/${f}";
+  in {
+    enable = true;
+    createDirectories = true;
+    templates = homeDir "temps";
+    publicShare = homeDir "pub";
+    desktop = homeDir "desktop";
+    download = homeDir "downloads";
+    documents = homeDir "docs";
+    pictures = homeDir "pics";
+    videos = homeDir "vids";
+    music = homeDir "music";
+  };
 }