diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-19 11:59:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 11:59:06 -0400 |
| commit | 9125f51b7068fa63d2fb3092862720a584229073 (patch) | |
| tree | 21abd3f1a74f1da0f84dcf62d712391ef13027c4 /nixos | |
| parent | 893b7b5adf4d67c3f50b47d8307921dc29fc96e2 (diff) | |
| parent | 38c7d55d5dcfe9e5fb18fd9b51041b59944cd0eb (diff) | |
| download | nixlib-9125f51b7068fa63d2fb3092862720a584229073.tar nixlib-9125f51b7068fa63d2fb3092862720a584229073.tar.gz nixlib-9125f51b7068fa63d2fb3092862720a584229073.tar.bz2 nixlib-9125f51b7068fa63d2fb3092862720a584229073.tar.lz nixlib-9125f51b7068fa63d2fb3092862720a584229073.tar.xz nixlib-9125f51b7068fa63d2fb3092862720a584229073.tar.zst nixlib-9125f51b7068fa63d2fb3092862720a584229073.zip | |
Merge pull request #66860 from worldofpeace/dconf-update
nixos/dconf: cleanup
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/dconf.nix | 10 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.nix | 3 |
3 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index b7bfb8504b6f..eeebc3558bdf 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -34,11 +34,11 @@ in services.dbus.packages = [ pkgs.gnome3.dconf ]; - environment.variables.GIO_EXTRA_MODULES = optional cfg.enable - "${pkgs.gnome3.dconf.lib}/lib/gio/modules"; - # https://github.com/NixOS/nixpkgs/pull/31891 - #environment.variables.XDG_DATA_DIRS = optional cfg.enable - # "$(echo ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; + # For dconf executable + environment.systemPackages = [ pkgs.gnome3.dconf ]; + + # Needed for unwrapped applications + environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.gnome3.dconf.lib}/lib/gio/modules" ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index cbfd2d3c2ea2..b0e2b34a31e2 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -161,6 +161,7 @@ in { xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; # Enable default programs + programs.dconf.enable = true; programs.evince.enable = mkDefault true; programs.file-roller.enable = mkDefault true; programs.gnome-disks.enable = mkDefault true; @@ -230,8 +231,8 @@ in { services.xserver.updateDbusEnvironment = true; - environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" - "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; + environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; + environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath ++ (pkgs.gnome3.removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index f0cafc377585..685d3534509b 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -146,6 +146,7 @@ in isSystem = true; }; + programs.dconf.enable = true; programs.evince.enable = mkDefault true; programs.file-roller.enable = mkDefault true; @@ -162,7 +163,6 @@ in environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; environment.variables.GIO_EXTRA_MODULES = [ - "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; @@ -187,7 +187,6 @@ in glib-networking gnome-menus gnome3.adwaita-icon-theme - gnome3.dconf gtk3.out hicolor-icon-theme lightlocker |