Merge commit '6cc4fd6ede4909226cb81d3475834251ed1b7210'

1 files changed, 20 insertions, 17 deletions

diff --git a/home-manager/modules/misc/xdg-user-dirs.nix b/home-manager/modules/misc/xdg-user-dirs.nix
index 4d034d7fe43..da9d3c43ad9 100644
--- a/home-manager/modules/misc/xdg-user-dirs.nix
+++ b/home-manager/modules/misc/xdg-user-dirs.nix
@@ -6,11 +6,17 @@ let
 
   cfg = config.xdg.userDirs;
 
-in
-
-{
+in {
   meta.maintainers = with maintainers; [ pacien ];
 
+  imports = [
+    (mkRenamedOptionModule [ "xdg" "userDirs" "publishShare" ] [
+      "xdg"
+      "userDirs"
+      "publicShare"
+    ])
+  ];
+
   options.xdg.userDirs = {
     enable = mkOption {
       type = types.bool;
@@ -56,7 +62,7 @@ in
       description = "The Pictures directory.";
     };
 
-    publishShare = mkOption {
+    publicShare = mkOption {
       type = types.str;
       default = "$HOME/Public";
       description = "The Public share directory.";
@@ -83,18 +89,15 @@ in
   };
 
   config = mkIf cfg.enable {
-    xdg.configFile."user-dirs.dirs".text = generators.toKeyValue {} (
-      {
-        XDG_DESKTOP_DIR = cfg.desktop;
-        XDG_DOCUMENTS_DIR = cfg.documents;
-        XDG_DOWNLOAD_DIR = cfg.download;
-        XDG_MUSIC_DIR = cfg.music;
-        XDG_PICTURES_DIR = cfg.pictures;
-        XDG_PUBLICSHARE_DIR = cfg.publishShare;
-        XDG_TEMPLATES_DIR = cfg.templates;
-        XDG_VIDEOS_DIR = cfg.videos;
-      }
-      // cfg.extraConfig
-    );
+    xdg.configFile."user-dirs.dirs".text = generators.toKeyValue { } ({
+      XDG_DESKTOP_DIR = cfg.desktop;
+      XDG_DOCUMENTS_DIR = cfg.documents;
+      XDG_DOWNLOAD_DIR = cfg.download;
+      XDG_MUSIC_DIR = cfg.music;
+      XDG_PICTURES_DIR = cfg.pictures;
+      XDG_PUBLICSHARE_DIR = cfg.publicShare;
+      XDG_TEMPLATES_DIR = cfg.templates;
+      XDG_VIDEOS_DIR = cfg.videos;
+    } // cfg.extraConfig);
   };
 }