From 4d53427bce7bf3d17e699252fd84dc7468afc46e Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Wed, 31 Jan 2024 18:24:56 -0500 Subject: [PATCH] xfconf: fix config loading The `run` function export was removed in #4965. This broke the expectation in this module that `run` would be available outside of main activation script, as `$DRY_RUN_CMD` once was. Fixes #4980 --- modules/misc/xfconf.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/misc/xfconf.nix b/modules/misc/xfconf.nix index f343020e3..087040085 100644 --- a/modules/misc/xfconf.nix +++ b/modules/misc/xfconf.nix @@ -120,8 +120,10 @@ in { (channel: properties: mapAttrsToList (mkCommand channel) properties) cfg.settings; - load = pkgs.writeShellScript "load-xfconf" - (concatMapStrings concatStrings commands); + load = pkgs.writeShellScript "load-xfconf" '' + ${config.lib.bash.initHomeManagerLib} + ${concatMapStrings concatStrings commands} + ''; in '' if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then export DBUS_RUN_SESSION_CMD=""