JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #66860 from worldofpeace/dconf-update

Browse Source 
nixos/dconf: cleanup
This commit is contained in:
worldofpeace 2019-08-19 11:59:06 -04:00 committed by GitHub
commit 9125f51b70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/programs/dconf.nix
View File

@ -34,11 +34,11 @@ in
services.dbus.packages = [ pkgs.gnome3.dconf ]; services.dbus.packages = [ pkgs.gnome3.dconf ];
environment.variables.GIO_EXTRA_MODULES = optional cfg.enable # For dconf executable
"${pkgs.gnome3.dconf.lib}/lib/gio/modules"; environment.systemPackages = [ pkgs.gnome3.dconf ];
# https://github.com/NixOS/nixpkgs/pull/31891
#environment.variables.XDG_DATA_DIRS = optional cfg.enable # Needed for unwrapped applications
# "$(echo ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.gnome3.dconf.lib}/lib/gio/modules" ];
}; };
} }

5
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -161,6 +161,7 @@ in {
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
# Enable default programs # Enable default programs
programs.dconf.enable = true;
programs.evince.enable = mkDefault true; programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true; programs.file-roller.enable = mkDefault true;
programs.gnome-disks.enable = mkDefault true; programs.gnome-disks.enable = mkDefault true;
@ -230,8 +231,8 @@ in {
services.xserver.updateDbusEnvironment = true; services.xserver.updateDbusEnvironment = true;
environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.gvfs}/lib/gio/modules" ];
"${pkgs.gnome3.gvfs}/lib/gio/modules" ];
environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
++ (pkgs.gnome3.removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ ++ (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/ pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/

3
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -146,6 +146,7 @@ in
isSystem = true; isSystem = true;
}; };
programs.dconf.enable = true;
programs.evince.enable = mkDefault true; programs.evince.enable = mkDefault true;
programs.file-roller.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.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
environment.variables.GIO_EXTRA_MODULES = [ environment.variables.GIO_EXTRA_MODULES = [
"${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
"${pkgs.gnome3.gvfs}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules"
]; ];
@ -187,7 +187,6 @@ in
glib-networking glib-networking
gnome-menus gnome-menus
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
gnome3.dconf
gtk3.out gtk3.out
hicolor-icon-theme hicolor-icon-theme
lightlocker lightlocker