nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-12-17 14:31:09 +01:00
Code Activity

dconf: Fix dconf config not apply correctly (#7131)

Browse source
This commit is contained in:
Rosario Pulella 2025-05-28 14:11:16 -04:00 • committed by GitHub
parent 83665c39fa
commit 529d2aac54
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/misc/dconf.nix
View file

@ -76,13 +76,13 @@ in
}; };
}; };
config = lib.mkIf cfg.enable ( config = lib.mkMerge [
{ (lib.mkIf cfg.enable {
home.packages = [ pkgs.dconf ]; home.packages = [ pkgs.dconf ];
dbus.packages = [ pkgs.dconf ]; dbus.packages = [ pkgs.dconf ];
home.sessionVariables.GIO_EXTRA_MODULES = "${pkgs.dconf.lib}/lib/gio/modules"; home.sessionVariables.GIO_EXTRA_MODULES = "${pkgs.dconf.lib}/lib/gio/modules";
} })
// lib.mkIf (cfg.settings != { }) { (lib.mkIf (cfg.enable && cfg.settings != { }) {
# Make sure the dconf directory exists. # Make sure the dconf directory exists.
xdg.configFile."dconf/.keep".source = builtins.toFile "keep" ""; xdg.configFile."dconf/.keep".source = builtins.toFile "keep" "";
@ -147,6 +147,6 @@ in
unset DCONF_DBUS_RUN_SESSION unset DCONF_DBUS_RUN_SESSION
'' ''
); );
} })
); ];
} }

1
tests/modules/home-environment/session-variables.nix
View file

@ -9,6 +9,7 @@ let
if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi
export __HM_SESS_VARS_SOURCED=1 export __HM_SESS_VARS_SOURCED=1
export GIO_EXTRA_MODULES="${pkgs.dconf}/lib/gio/modules"
export LOCALE_ARCHIVE_2_27="${config.i18n.glibcLocales}/lib/locale/locale-archive" export LOCALE_ARCHIVE_2_27="${config.i18n.glibcLocales}/lib/locale/locale-archive"
export V1="v1" export V1="v1"
export V2="v2-v1" export V2="v2-v1"