From 918b7d572f4caf5b4a91be1eded7aef49bc35f55 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 18 Aug 2019 21:54:00 -0400 Subject: [PATCH 1/3] nixos/dconf: cleanup Add dconf to systemPackages and make GIO_EXTRA_MODULES a list so it can actually merge. --- nixos/modules/programs/dconf.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index b7bfb8504b6..eeebc3558bd 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" ]; }; } From a7b5d6142f17a3be686db0bd296d17208dee66e9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 18 Aug 2019 21:55:52 -0400 Subject: [PATCH 2/3] nixos/gnome3: use programs.dconf --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index cbfd2d3c2ea..b0e2b34a31e 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/ From 38c7d55d5dcfe9e5fb18fd9b51041b59944cd0eb Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 18 Aug 2019 21:56:52 -0400 Subject: [PATCH 3/3] nixos/pantheon: use programs.dconf --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index f0cafc37758..685d3534509 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