diff --git a/home/david/configurations/Akun/default.nix b/home/david/configurations/Akun/default.nix
index 8fba96e..172e409 100644
--- a/home/david/configurations/Akun/default.nix
+++ b/home/david/configurations/Akun/default.nix
@@ -29,20 +29,9 @@
   david = {
     wallpaper.enable = true;
     programs.openssh.enable = true;
+    xdg-dirs.enable = true;
   };
 
-  xdg.userDirs = {
-    enable = true;
-    download = "${config.home.homeDirectory}/dls";
-    documents = "${config.home.homeDirectory}/doc";
-    music = "${config.home.homeDirectory}/mus";
-    pictures = "${config.home.homeDirectory}/pic";
-    videos = "${config.home.homeDirectory}/vid";
-    templates = "${config.home.homeDirectory}/tpl";
-    publicShare = "${config.home.homeDirectory}/pub";
-    desktop = "${config.home.homeDirectory}/dsk";
-    createDirectories = true;
-  };
   home.username = "${unixName}";
   home.homeDirectory = "/home/${unixName}";
   home.stateVersion = "24.11";
diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix
index 8c52a88..5c3ca69 100644
--- a/home/david/configurations/Tytonidae/default.nix
+++ b/home/david/configurations/Tytonidae/default.nix
@@ -38,20 +38,9 @@
   david = {
     wallpaper.enable = true;
     programs.openssh.enable = true;
+    xdg-dirs.enable = true;
   };
 
-  xdg.userDirs = {
-    enable = true;
-    download = "${config.home.homeDirectory}/dls";
-    documents = "${config.home.homeDirectory}/doc";
-    music = "${config.home.homeDirectory}/mus";
-    pictures = "${config.home.homeDirectory}/pic";
-    videos = "${config.home.homeDirectory}/vid";
-    templates = "${config.home.homeDirectory}/tpl";
-    publicShare = "${config.home.homeDirectory}/pub";
-    desktop = "${config.home.homeDirectory}/dsk";
-    createDirectories = true;
-  };
   home.username = "${unixName}";
   home.homeDirectory = "/home/${unixName}";
   home.stateVersion = "24.11";
diff --git a/home/david/modules/default.nix b/home/david/modules/default.nix
index 882ebe7..d71796a 100644
--- a/home/david/modules/default.nix
+++ b/home/david/modules/default.nix
@@ -3,6 +3,7 @@
   imports = [
     ./wallpaper.nix
     ./programs
+    ./xdg-dirs.nix
   ];
   config = {
     home.packages = with pkgs; [
diff --git a/home/david/modules/xdg-dirs.nix b/home/david/modules/xdg-dirs.nix
new file mode 100644
index 0000000..c1064bf
--- /dev/null
+++ b/home/david/modules/xdg-dirs.nix
@@ -0,0 +1,25 @@
+{ lib, config, ... }:
+let
+  cfg = config.david.xdg-dirs;
+in
+{
+  options = {
+    david.xdg-dirs = {
+      enable = lib.mkEnableOption "xdg-dirs";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    xdg.userDirs = {
+      enable = true;
+      download = "${config.home.homeDirectory}/dls";
+      documents = "${config.home.homeDirectory}/doc";
+      music = "${config.home.homeDirectory}/mus";
+      pictures = "${config.home.homeDirectory}/pic";
+      videos = "${config.home.homeDirectory}/vid";
+      templates = "${config.home.homeDirectory}/tpl";
+      publicShare = "${config.home.homeDirectory}/pub";
+      desktop = "${config.home.homeDirectory}/dsk";
+      createDirectories = true;
+    };
+  };
+}