nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

gtk: add color scheme option

Browse source
This commit is contained in:
sweenu 2025-09-02 20:18:07 +02:00 • committed by Austin Horstman
parent ea3fe2bd72
commit f35703b412
10 changed files with 87 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/misc/gtk.nix
View file

@ -73,6 +73,17 @@ in
default = null;
description = "Default cursor theme for all GTK versions.";
};
colorScheme = mkOption {
type = types.nullOr (
types.enum [
"dark"
"light"
]
);
default = null;
description = "Default color scheme for all GTK versions";
};
};
config = mkIf cfg.enable {

2
modules/misc/gtk/gtk2.nix
View file

@ -103,12 +103,14 @@ in
text =
let
settings = gtkLib.mkGtkSettings {
gtkVersion = 2;
inherit (cfg2)
font
theme
iconTheme
cursorTheme
;
colorScheme = null;
};
settingsText = lib.concatMapStrings (n: "${formatGtk2Option n settings.${n}}\n") (
lib.attrNames settings

17
modules/misc/gtk/gtk3.nix
View file

@ -76,6 +76,18 @@ in
description = "Cursor theme for GTK 3 applications.";
};
colorScheme = mkOption {
type = types.nullOr (
types.enum [
"dark"
"light"
]
);
default = cfg.colorScheme;
defaultText = literalExpression "config.gtk.colorScheme";
description = "Color scheme for GTK 3 applications.";
};
extraConfig = mkOption {
type =
with types;
@ -112,11 +124,13 @@ in
text = toIni {
Settings =
gtkLib.mkGtkSettings {
gtkVersion = 3;
inherit (cfg3)
font
theme
iconTheme
cursorTheme
colorScheme
;
}
// cfg3.extraConfig;
@ -134,11 +148,13 @@ in
dconf.settings."org/gnome/desktop/interface" =
let
settings = gtkLib.mkGtkSettings {
gtkVersion = 3;
inherit (cfg3)
font
theme
iconTheme
cursorTheme
colorScheme
;
};
in
@ -148,6 +164,7 @@ in
"icon-theme" = settings."gtk-icon-theme-name" or null;
"cursor-theme" = settings."gtk-cursor-theme-name" or null;
"cursor-size" = settings."gtk-cursor-theme-size" or null;
"color-scheme" = if cfg3.colorScheme != null then "prefer-${cfg3.colorScheme}" else null;
};
};
}

14
modules/misc/gtk/gtk4.nix
View file

@ -76,6 +76,18 @@ in
description = "Cursor theme for GTK 4 applications.";
};
colorScheme = mkOption {
type = types.nullOr (
types.enum [
"dark"
"light"
]
);
default = cfg.colorScheme;
defaultText = literalExpression "config.gtk.colorScheme";
description = "Color scheme for GTK 4 applications.";
};
extraConfig = mkOption {
type =
with types;
@ -105,11 +117,13 @@ in
text = toIni {
Settings =
gtkLib.mkGtkSettings {
gtkVersion = 4;
inherit (cfg4)
font
theme
iconTheme
cursorTheme
colorScheme
;
}
// cfg4.extraConfig;

7
modules/misc/gtk/lib.nix
View file

@ -55,10 +55,12 @@ in
# Helper function to generate the settings attribute set for a given version
mkGtkSettings =
{
gtkVersion,
font,
theme,
iconTheme,
cursorTheme,
colorScheme,
}:
optionalAttrs (font != null) {
gtk-font-name =
@ -72,7 +74,10 @@ in
// optionalAttrs (cursorTheme != null) { "gtk-cursor-theme-name" = cursorTheme.name; }
// optionalAttrs (cursorTheme != null && cursorTheme.size != null) {
"gtk-cursor-theme-size" = cursorTheme.size;
};
}
// optionalAttrs (colorScheme == "dark") { "gtk-application-prefer-dark-theme" = true; }
// optionalAttrs (gtkVersion == 4 && colorScheme == "dark") { "gtk-interface-color-scheme" = 2; }
// optionalAttrs (gtkVersion == 4 && colorScheme == "light") { "gtk-interface-color-scheme" = 3; };
# Package collection helper for all GTK versions
collectGtkPackages =

3
tests/modules/misc/gtk/default.nix
View file

@ -3,6 +3,9 @@
gtk-per-version-override = ./gtk-per-version-override.nix;
gtk-selective-enable = ./gtk-selective-enable.nix;
# ColorScheme tests
gtk-colorscheme = ./gtk-colorscheme.nix;
# GTK2
gtk2-basic-config = ./gtk2/gtk2-basic-config.nix;
gtk2-config-file-location = ./gtk2/gtk2-config-file-location.nix;

30
tests/modules/misc/gtk/gtk-colorscheme.nix Normal file
View file

@ -0,0 +1,30 @@
{ pkgs, ... }:
{
gtk = {
enable = true;
theme.name = "Adwaita";
iconTheme.name = "Adwaita";
# Global dark colorScheme
colorScheme = "dark";
# GTK3 overrides to light
gtk3.colorScheme = "light";
};
nmt.script = ''
# GTK3's settings should be untouched
assertFileExists home-files/.config/gtk-3.0/settings.ini
assertFileNotRegex home-files/.config/gtk-3.0/settings.ini \
'gtk-application-prefer-dark-theme'
# GTK4 should inherit global dark colorScheme
assertFileExists home-files/.config/gtk-4.0/settings.ini
assertFileContains home-files/.config/gtk-4.0/settings.ini \
'gtk-application-prefer-dark-theme=true'
assertFileContains home-files/.config/gtk-4.0/settings.ini \
'gtk-interface-color-scheme=2'
echo "ColorScheme test completed successfully"
'';
}

1
tests/modules/misc/gtk/gtk-global-inheritance-gtk3-expected.ini
View file

@ -1,4 +1,5 @@
[Settings]
gtk-application-prefer-dark-theme=true
gtk-cursor-theme-name=Adwaita
gtk-cursor-theme-size=24
gtk-font-name=Ubuntu 12

2
tests/modules/misc/gtk/gtk-global-inheritance-gtk4-expected.ini
View file

@ -1,6 +1,8 @@
[Settings]
gtk-application-prefer-dark-theme=true
gtk-cursor-theme-name=Adwaita
gtk-cursor-theme-size=24
gtk-font-name=Ubuntu 12
gtk-icon-theme-name=Adwaita
gtk-interface-color-scheme=2
gtk-theme-name=Adwaita-dark

1
tests/modules/misc/gtk/gtk-global-inheritance.nix
View file

@ -19,6 +19,7 @@
name = "Adwaita";
size = 24;
};
colorScheme = "dark";
};
nmt.script = ''