From cc964b4609616e4dffbe67a6e8c8924540ceae6e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 24 Dec 2018 12:05:28 +0100 Subject: [PATCH] gtk: remove option gtk.gtk3.waylandSupport --- modules/misc/gtk.nix | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix index 6542091c0..c88ee4c00 100644 --- a/modules/misc/gtk.nix +++ b/modules/misc/gtk.nix @@ -76,6 +76,12 @@ in { meta.maintainers = [ maintainers.rycee ]; + imports = [ + (mkRemovedOptionModule ["gtk" "gtk3" "waylandSupport"] '' + This options is not longer needed and can be removed. + '') + ]; + options = { gtk = { enable = mkEnableOption "GTK 2/3 configuration"; @@ -131,21 +137,6 @@ in ~/.config/gtk-3.0/gtk.css. ''; }; - - waylandSupport = mkOption { - type = types.bool; - default = false; - description = '' - Support GSettings provider (dconf) in addition to - GtkSettings (INI file). This is needed for Wayland. - - Note, on NixOS the following line must be in the - system configuration: - - services.dbus.packages = [ pkgs.gnome3.dconf ]; - - ''; - }; }; }; }; @@ -176,7 +167,6 @@ in optional (opt != null && opt.package != null) opt.package; in { - home.packages = optionalPackage cfg.font ++ optionalPackage cfg.theme @@ -192,9 +182,7 @@ in xdg.configFile."gtk-3.0/gtk.css".text = cfg3.extraCss; - dconf.settings = mkIf cfg3.waylandSupport { - "org/gnome/desktop/interface" = dconfIni; - }; + dconf.settings."org/gnome/desktop/interface" = dconfIni; } ); }