diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/font/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/gnome/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/gnome/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/hyprland/meta/main.yml | 1 | ||||
| -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 |
9 files changed, 15 insertions, 11 deletions
diff --git a/roles/font/tasks/main.yml b/roles/font/tasks/main.yml index 75e15a41..6a6e19b1 100644 --- a/roles/font/tasks/main.yml +++ b/roles/font/tasks/main.yml @@ -44,8 +44,3 @@ dest: "{{ item.dest }}" state: "link" loop: "{{ font_presets }}" - -- name: "Configure gnome font" - ansible.builtin.command: - cmd: 'gsettings set org.gnome.desktop.interface font-name "Noto Sans"' - changed_when: false diff --git a/roles/gnome/meta/main.yml b/roles/gnome/meta/main.yml index 7bf50bcb..248c5c50 100644 --- a/roles/gnome/meta/main.yml +++ b/roles/gnome/meta/main.yml @@ -1,5 +1,6 @@ --- -dependencies: [] +dependencies: + - role: "font" galaxy_info: author: "a14m" description: "Install gnome" diff --git a/roles/gnome/tasks/main.yml b/roles/gnome/tasks/main.yml index d1589e6b..5b9eee94 100644 --- a/roles/gnome/tasks/main.yml +++ b/roles/gnome/tasks/main.yml @@ -4,3 +4,8 @@ - name: "Include OS-specific tasks" ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" + +- name: "Configure gnome font" + ansible.builtin.command: + cmd: 'gsettings set org.gnome.desktop.interface font-name "Noto Sans"' + changed_when: false diff --git a/roles/hyprland/meta/main.yml b/roles/hyprland/meta/main.yml index 6e2ef3b7..05bd0823 100644 --- a/roles/hyprland/meta/main.yml +++ b/roles/hyprland/meta/main.yml @@ -6,6 +6,7 @@ dependencies: - role: "mako" - role: "pipewire" - role: "brightnessctl" + - role: "font" - role: "waybar" - role: "hyprtheme" - role: "hyprcursor" 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) |