diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix index d6fedfe41..7f4f537ed 100644 --- a/modules/misc/gtk.nix +++ b/modules/misc/gtk.nix @@ -180,21 +180,4 @@ in xdg.configFile."gtk-3.0/gtk.css".text = cfg3.extraCss; } ); - - imports = - let - name = n: [ "gtk" n ]; - in [ - (mkChangedOptionModule (name "fontName") (name "font") ( - config: { name = getAttrFromPath (name "fontName") config; } - )) - - (mkChangedOptionModule (name "themeName") (name "theme") ( - config: { name = getAttrFromPath (name "themeName") config; } - )) - - (mkChangedOptionModule (name "iconThemeName") (name "iconTheme") ( - config: { name = getAttrFromPath (name "iconThemeName") config; } - )) - ]; } diff --git a/modules/misc/news.nix b/modules/misc/news.nix index c8726da2b..8ca9b7aae 100644 --- a/modules/misc/news.nix +++ b/modules/misc/news.nix @@ -451,33 +451,6 @@ in ''; } - { - time = "2017-11-23T00:31:12+00:00"; - condition = - config.gtk.fontName != "_mkMergedOptionModule" - || config.gtk.themeName != "_mkMergedOptionModule" - || config.gtk.iconThemeName != "_mkMergedOptionModule"; - message = '' - The options - - gtk.fontName, gtk.themeName, and gtk.iconThemeName - - are deprecated and will be removed on December 23, 2017. - - Please use - - gtk.font.name, gtk.theme.name, and gtk.iconTheme.name - - instead. You can find information about these in the manual - page. - - This change was made to introduce the options - 'gtk.font.package', 'gtk.theme.package', and - 'gtk.iconTheme.package', which allow you to specify the - package that provides the font or theme. - ''; - } - { time = "2017-11-26T21:57:23+00:00"; message = ''