Skip to content

Revert "misc/gtk: move gtkrc-2.0" #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Revert "misc/gtk: move gtkrc-2.0" #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions modules/collection/misc/gtk.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
...
}: let
inherit (lib.options) literalExpression mkOption mkEnableOption;
inherit (lib.types) listOf package lines str path;
inherit (lib.types) listOf package lines str;
inherit (lib.modules) mkIf mkRenamedOptionModule;
inherit (lib.lists) optionals;
inherit (lib.attrsets) optionalAttrs;
Expand Down Expand Up @@ -58,17 +58,6 @@ in {
[official GTK documentation]: https://docs.gtk.org/gtk3/class.Settings.html
'';
};
gtk2Location = mkOption {
type = path;
default = ".gtkrc-2.0";
defaultText = "$HOME/.gtkrc-2.0";
example = ".config/gtk-2.0/gtkrc";
description = ''
The location relative to {env}`$HOME` to write the GTK-2.0 settings to.
By default, apps search at {file}`$HOME/.gtkrc-2.0`, but the environmental
variable {env}`GTK2_RC_FILES` can be set to a different location.
'';
};
css = {
gtk3 = mkOption {
type = lines;
Expand Down Expand Up @@ -117,12 +106,12 @@ in {
inherit (cfg) packages;

files = optionalAttrs (cfg.settings != {}) {
${cfg.gtk2Location}.text = toGtk2Text {inherit (cfg) settings;};
".gtkrc-2.0".text = toGtk2Text {inherit (cfg) settings;};
};
xdg.config.files = (
optionalAttrs (cfg.settings != {}) {
".config/gtk-3.0/settings.ini".text = toGtkINI {Settings = cfg.settings;};
".config/gtk-4.0/settings.ini".text = toGtkINI {Settings = cfg.settings;};
"gtk-3.0/settings.ini".text = toGtkINI {Settings = cfg.settings;};
"gtk-4.0/settings.ini".text = toGtkINI {Settings = cfg.settings;};
}
// optionalAttrs (cfg.css.gtk3 != "") {
"gtk-3.0/gtk.css".text = cfg.css.gtk3;
Expand All @@ -137,7 +126,7 @@ in {

# Set sessionVariables to load
environment.sessionVariables = {
GTK2_RC_FILES = "${config.directory}/${cfg.gtk2Location}";
GTK2_RC_FILES = "${config.directory}/.gtkrc-2.0";
GTK_THEME = mkIf (hasAttr "theme-name" cfg.settings) cfg.settings.theme-name;
};
};
Expand Down