diff options
| author | Ahmed Abdelhalim <[email protected]> | 2026-02-19 16:12:10 +0100 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2026-02-19 16:36:16 +0100 |
| commit | 37e2f822c37e4ce08b029595c04e692eb197f86e (patch) | |
| tree | ada39ae4afa0b3dc4965e900aa09c51fe4340c6a /roles | |
| parent | 221ca9d12199dfe6ed73ce8724d31833a63675dd (diff) | |
Merge the aur_font in the font role with conditional dependency
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/aur_font/meta/argument_specs.yml | 6 | ||||
| -rw-r--r-- | roles/aur_font/meta/main.yml | 12 | ||||
| -rw-r--r-- | roles/font/meta/main.yml | 4 | ||||
| -rw-r--r-- | roles/font/tasks/install-archlinux.yml (renamed from roles/aur_font/tasks/main.yml) | 3 | ||||
| -rw-r--r-- | roles/font/tasks/install-debian.yml | 1 | ||||
| -rw-r--r-- | roles/font/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/font/vars/archlinux.yml | 3 | ||||
| -rw-r--r-- | roles/hyprland/meta/main.yml | 1 |
8 files changed, 11 insertions, 22 deletions
diff --git a/roles/aur_font/meta/argument_specs.yml b/roles/aur_font/meta/argument_specs.yml deleted file mode 100644 index be51c8a9..00000000 --- a/roles/aur_font/meta/argument_specs.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -argument_specs: - main: - short_description: "Install fonts on ArchLinux using AUR" - description: "Install fonts on ArchLinux using AUR" - options: {} diff --git a/roles/aur_font/meta/main.yml b/roles/aur_font/meta/main.yml deleted file mode 100644 index dd82ddcb..00000000 --- a/roles/aur_font/meta/main.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -dependencies: - - role: "yay" -galaxy_info: - author: "a14m" - description: "Install fonts on ArchLinux using AUR" - license: "MIT" - min_ansible_version: "2.18" - platforms: - - name: "ArchLinux" - versions: - - "all" diff --git a/roles/font/meta/main.yml b/roles/font/meta/main.yml index b1706f98..b9f45ad7 100644 --- a/roles/font/meta/main.yml +++ b/roles/font/meta/main.yml @@ -1,5 +1,7 @@ --- -dependencies: [] +dependencies: + - role: "yay" + when: ansible_facts['distribution'] == "Archlinux" galaxy_info: author: "a14m" description: "Install fonts on linux distros." diff --git a/roles/aur_font/tasks/main.yml b/roles/font/tasks/install-archlinux.yml index 3f901fe1..ee44f05a 100644 --- a/roles/aur_font/tasks/main.yml +++ b/roles/font/tasks/install-archlinux.yml @@ -6,5 +6,4 @@ name: "{{ item }}" state: "present" use: "yay" - loop: - - "ttf-pt-sans" + loop: "{{ font_aur_packages }}" diff --git a/roles/font/tasks/install-debian.yml b/roles/font/tasks/install-debian.yml new file mode 100644 index 00000000..ed97d539 --- /dev/null +++ b/roles/font/tasks/install-debian.yml @@ -0,0 +1 @@ +--- diff --git a/roles/font/tasks/main.yml b/roles/font/tasks/main.yml index ab266c2b..5b1cb859 100644 --- a/roles/font/tasks/main.yml +++ b/roles/font/tasks/main.yml @@ -44,3 +44,6 @@ dest: "{{ item.dest }}" state: "link" loop: "{{ font_presets }}" + +- name: "Ensure OS-specific tasks installed" + ansible.builtin.include_vars: "install-{{ ansible_facts['os_family'] | lower }}.yml" diff --git a/roles/font/vars/archlinux.yml b/roles/font/vars/archlinux.yml index a09db9c7..2197e5cb 100644 --- a/roles/font/vars/archlinux.yml +++ b/roles/font/vars/archlinux.yml @@ -5,6 +5,9 @@ font_packages: - "noto-fonts" - "noto-fonts-emoji" +font_aur_packages: + - "ttf-pt-sans" + font_presets: - src: "/usr/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf" dest: "/etc/fonts/conf.d/10-sub-pixel-rgb.conf" diff --git a/roles/hyprland/meta/main.yml b/roles/hyprland/meta/main.yml index 5836cd2b..9ef1205e 100644 --- a/roles/hyprland/meta/main.yml +++ b/roles/hyprland/meta/main.yml @@ -8,7 +8,6 @@ dependencies: - role: "brightnessctl" - role: "ddcutil" - role: "font" - - role: "aur_font" - role: "waybar" - role: "clipse" - role: "tofi" |