xdg-user-dirs: create directories after linkGeneration

In the scenario where some XDG user directory is a symlink defined by `home.file`, we want the symlink to be created before we try to `mkdir -p` that directory, as it will then silently succeed. On the other hand, if we create the directory first, creating the symlink will fail. We lose nothing by doing this as `linkGeneration` creates the directories it needs.
nix-community · Jul 25, 2022 · dbed4c7 · dbed4c7
1 parent 8419dfd
commit dbed4c7
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/modules/misc/xdg-user-dirs.nix b/modules/misc/xdg-user-dirs.nix
@@ -120,12 +120,10 @@ in {
 
     home.sessionVariables = directories;
 
-    home.activation = mkIf cfg.createDirectories {
-      createXdgUserDirectories = let
-        directoriesList = attrValues directories;
-        mkdir = (dir: ''$DRY_RUN_CMD mkdir -p $VERBOSE_ARG "${dir}"'');
-      in lib.hm.dag.entryAfter [ "writeBoundary" ]
-      (strings.concatMapStringsSep "\n" mkdir directoriesList);
-    };
+    home.activation.createXdgUserDirectories = mkIf cfg.createDirectories (let
+      directoriesList = attrValues directories;
+      mkdir = (dir: ''$DRY_RUN_CMD mkdir -p $VERBOSE_ARG "${dir}"'');
+    in lib.hm.dag.entryAfter [ "linkGeneration" ]
+    (strings.concatMapStringsSep "\n" mkdir directoriesList));
   };
 }