Merge the aur_font in the font role with conditional dependency

11 files changed, 11 insertions, 25 deletions

diff --git a/configure.yml b/configure.yml
index c5de4866..c0662529 100644
--- a/configure.yml
+++ b/configure.yml
@@ -8,7 +8,6 @@
     - role: "timezone"
     - role: "yay"
     - role: "font"
-    - role: "aur_font"
     - role: "which"
     - role: "bash"
     - role: "alacritty"
diff --git a/molecule/archlinux-gnome/converge.yml b/molecule/archlinux-gnome/converge.yml
index 2d1554ad..8bec3747 100644
--- a/molecule/archlinux-gnome/converge.yml
+++ b/molecule/archlinux-gnome/converge.yml
@@ -60,7 +60,6 @@
     - role: "timezone"
     - role: "yay"
     - role: "font"
-    - role: "aur_font"
     - role: "which"
     - role: "bash"
     - role: "alacritty"
diff --git a/molecule/archlinux/converge.yml b/molecule/archlinux/converge.yml
index 2f3bbf2b..7b0b76cc 100644
--- a/molecule/archlinux/converge.yml
+++ b/molecule/archlinux/converge.yml
@@ -60,7 +60,6 @@
     - role: "timezone"
     - role: "yay"
     - role: "font"
-    - role: "aur_font"
     - role: "which"
     - role: "bash"
     - role: "alacritty"
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"