nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

dconf: revert: dconf: Provide dconf (#7215)

Browse source 
Providing dconf via hm in this manner provided to be problematic for 
user with systems that were already providing dconf (like ubunut).

Revert ff73544e4a
This commit is contained in:
Rosario Pulella 2025-06-05 16:06:51 -04:00 • committed by GitHub
parent 13a45ede6c
commit 09b0a4b0da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 63 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/misc/dconf.nix
View file

@ -33,7 +33,8 @@ in
options = { options = {
dconf = { dconf = {
enable = lib.mkEnableOption "dconf" // { enable = lib.mkOption {
type = types.bool;
# While technically dconf on darwin could work, our activation step # While technically dconf on darwin could work, our activation step
# requires dbus, which only *lightly* supports Darwin in general, and # requires dbus, which only *lightly* supports Darwin in general, and
# not at all in the way it's packaged in nixpkgs. Because of this, we # not at all in the way it's packaged in nixpkgs. Because of this, we
@ -42,6 +43,13 @@ in
# re-enabled, unclear whether there's actual value in it though. # re-enabled, unclear whether there's actual value in it though.
default = !pkgs.stdenv.hostPlatform.isDarwin; default = !pkgs.stdenv.hostPlatform.isDarwin;
visible = false; visible = false;
description = ''
Whether to enable dconf settings.Add commentMore actions
Note, if you use NixOS then you must add
`programs.dconf.enable = true`
to your system configuration. Otherwise you will see a systemd error
message when your configuration is activated.
'';
}; };
settings = lib.mkOption { settings = lib.mkOption {
@ -76,15 +84,7 @@ in
}; };
}; };
config = lib.mkMerge [ config = lib.mkIf (cfg.enable && cfg.settings != { }) {
(lib.mkIf cfg.enable {
home.packages = [ pkgs.dconf ];
dbus.packages = [ pkgs.dconf ];
home.sessionVariablesExtra = ''
export GIO_EXTRA_MODULES="${pkgs.dconf.lib}/lib/gio/modules''${GIO_EXTRA_MODULES:+:}$GIO_EXTRA_MODULES"
'';
})
(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" "";
@ -149,6 +149,5 @@ in
unset DCONF_DBUS_RUN_SESSION unset DCONF_DBUS_RUN_SESSION
'' ''
); );
}) };
];
} }

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

@ -17,7 +17,6 @@ let
export XDG_DATA_HOME="/home/hm-user/.local/share" export XDG_DATA_HOME="/home/hm-user/.local/share"
export XDG_STATE_HOME="/home/hm-user/.local/state" export XDG_STATE_HOME="/home/hm-user/.local/state"
export GIO_EXTRA_MODULES="${pkgs.dconf}/lib/gio/modules''${GIO_EXTRA_MODULES:+:}$GIO_EXTRA_MODULES"
''; '';
darwinExpected = '' darwinExpected = ''