diff options
| author | Ahmed Abdelhalim <[email protected]> | 2026-01-22 21:48:13 +0100 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2026-01-22 21:48:13 +0100 |
| commit | 6e8e19aa82f7db3fbea5d60709969e19dc9b162a (patch) | |
| tree | dfc7625692bdeda9a111053f423f52cb95e540f4 /roles/hyprtheme | |
| parent | e845ccff69a4ffb8c3344578917fed00ad639ef4 (diff) | |
Fix font implicit gnome dependency
This separate the setup of fonts from the setting of fonts
The role setup the fonts to be used
The other dependant roles configure which font from there to be used
This is more complicated but cleaner separation between each role
responsibilities
Diffstat (limited to 'roles/hyprtheme')
| -rw-r--r-- | roles/hyprtheme/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/hyprtheme/files/scripts/theme-set | 2 | ||||
| -rw-r--r-- | roles/hyprtheme/meta/argument_specs.yml | 4 | ||||
| -rw-r--r-- | roles/hyprtheme/templates/theme/hyprland.conf.j2 | 2 | ||||
| -rw-r--r-- | roles/hyprtheme/templates/theme/hyprlock.conf.j2 | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/roles/hyprtheme/defaults/main.yml b/roles/hyprtheme/defaults/main.yml index ec2b3877..d697812c 100644 --- a/roles/hyprtheme/defaults/main.yml +++ b/roles/hyprtheme/defaults/main.yml @@ -1,3 +1,3 @@ --- -hyprtheme_default_font: "JetBrainsMono Nerd Font" +hyprtheme_default_mono_font: "JetBrainsMono Nerd Font" hyprtheme_default_theme: "everforest" diff --git a/roles/hyprtheme/files/scripts/theme-set b/roles/hyprtheme/files/scripts/theme-set index 61b7345e..4cacd5b3 100644 --- a/roles/hyprtheme/files/scripts/theme-set +++ b/roles/hyprtheme/files/scripts/theme-set @@ -42,9 +42,11 @@ killall -SIGUSR2 ghostty >/dev/null 2>&1 || true if [[ -f ~/.config/hyprtheme/current/light.mode ]]; then gsettings set org.gnome.desktop.interface color-scheme "prefer-light" gsettings set org.gnome.desktop.interface gtk-theme "Adwaita" + gsettings set org.gnome.desktop.interface font-name "Noto Sans" else gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark" + gsettings set org.gnome.desktop.interface font-name "Noto Sans" fi # # Change gnome icon theme color diff --git a/roles/hyprtheme/meta/argument_specs.yml b/roles/hyprtheme/meta/argument_specs.yml index f949da72..5bb93ae6 100644 --- a/roles/hyprtheme/meta/argument_specs.yml +++ b/roles/hyprtheme/meta/argument_specs.yml @@ -8,7 +8,7 @@ argument_specs: description: "The initial default theme to be used" type: "str" default: "everforest" - hyprtheme_default_font: - description: "The default theme font to be used" + hyprtheme_default_mono_font: + description: "The default theme mono font to be used" type: "str" default: "JetBrainsMono Nerd Font" diff --git a/roles/hyprtheme/templates/theme/hyprland.conf.j2 b/roles/hyprtheme/templates/theme/hyprland.conf.j2 index 8b0eda90..7ffb05fd 100644 --- a/roles/hyprtheme/templates/theme/hyprland.conf.j2 +++ b/roles/hyprtheme/templates/theme/hyprland.conf.j2 @@ -1,3 +1,3 @@ -$font = {{ hyprtheme_default_font }} +$font = {{ hyprtheme_default_mono_font }} $active = rgb({{ accent[1:] }}) $inactive = rgb({{ color0[1:] }}) diff --git a/roles/hyprtheme/templates/theme/hyprlock.conf.j2 b/roles/hyprtheme/templates/theme/hyprlock.conf.j2 index 98a0beca..13130d0a 100644 --- a/roles/hyprtheme/templates/theme/hyprlock.conf.j2 +++ b/roles/hyprtheme/templates/theme/hyprlock.conf.j2 @@ -2,7 +2,7 @@ {{ hex[1:3] | int(base=16)}}, {{ hex[3:5] | int(base=16) }}, {{ hex[5:7] | int(base=16) }} {%- endmacro %} -$font = {{ hyprtheme_default_font }} +$font = {{ hyprtheme_default_mono_font }} $color = rgba({{ hex_to_rgb(background) }}, 1.0) $inner_color = rgba({{ hex_to_rgb(background) }}, 0.8) $outer_color = rgba({{ hex_to_rgb(accent) }}, 1.0) |