Fix font role

15 files changed, 19 insertions, 19 deletions

diff --git a/configure.yml b/configure.yml
index 972da8ac..0f1e77aa 100644
--- a/configure.yml
+++ b/configure.yml
@@ -8,7 +8,7 @@
   roles:
     - role: "locales"
     - role: "timezone"
-    - role: "fonts"
+    - role: "font"
     - role: "which"
     - role: "bash"
     - role: "man"
@@ -42,7 +42,7 @@
   roles:
     - role: "locales"
     - role: "timezone"
-    - role: "fonts"
+    - role: "font"
     - role: "bash"
     - role: "man"
     - role: "jq"
diff --git a/molecule/archlinux-gnome/converge.yml b/molecule/archlinux-gnome/converge.yml
index 3fb3b473..eb71ee38 100644
--- a/molecule/archlinux-gnome/converge.yml
+++ b/molecule/archlinux-gnome/converge.yml
@@ -74,7 +74,7 @@
     - role: "password_store"
     - role: "which"
     - role: "firefox"
-    - role: "fonts"
+    - role: "font"
     - role: "alacritty"
     - role: "btop"
     - role: "bluetui"
diff --git a/molecule/archlinux/converge.yml b/molecule/archlinux/converge.yml
index 61d57f12..bc5a1bd9 100644
--- a/molecule/archlinux/converge.yml
+++ b/molecule/archlinux/converge.yml
@@ -73,7 +73,7 @@
     - role: "password_store"
     - role: "which"
     - role: "firefox"
-    - role: "fonts"
+    - role: "font"
     - role: "alacritty"
     - role: "btop"
     - role: "bluetui"
diff --git a/molecule/debian/converge.yml b/molecule/debian/converge.yml
index 8789b33b..222b3ba9 100644
--- a/molecule/debian/converge.yml
+++ b/molecule/debian/converge.yml
@@ -84,7 +84,7 @@
     - role: "password_store"
     - role: "which"
     - role: "firefox"
-    - role: "fonts"
+    - role: "font"
     - role: "alacritty"
     - role: "btop"
     - role: "wlctl"
diff --git a/molecule/raspberrypi/converge.yml b/molecule/raspberrypi/converge.yml
index 7fe92c71..117cda83 100644
--- a/molecule/raspberrypi/converge.yml
+++ b/molecule/raspberrypi/converge.yml
@@ -81,7 +81,7 @@
     - role: "password_store"
     - role: "which"
     - role: "firefox"
-    - role: "fonts"
+    - role: "font"
     - role: "alacritty"
     - role: "btop"
     - role: "wlctl"
diff --git a/molecule/ubuntu/converge.yml b/molecule/ubuntu/converge.yml
index 21a73f6d..ce890bde 100644
--- a/molecule/ubuntu/converge.yml
+++ b/molecule/ubuntu/converge.yml
@@ -73,7 +73,7 @@
     - role: "password_store"
     - role: "which"
     - role: "firefox"
-    - role: "fonts"
+    - role: "font"
     - role: "alacritty"
     - role: "btop"
     - role: "wlctl"
diff --git a/roles/fonts/meta/argument_specs.yml b/roles/font/meta/argument_specs.yml
index d44dc8c8..d44dc8c8 100644
--- a/roles/fonts/meta/argument_specs.yml
+++ b/roles/font/meta/argument_specs.yml
diff --git a/roles/fonts/meta/main.yml b/roles/font/meta/main.yml
index b1706f98..b1706f98 100644
--- a/roles/fonts/meta/main.yml
+++ b/roles/font/meta/main.yml
diff --git a/roles/fonts/tasks/main.yml b/roles/font/tasks/main.yml
index 74d3480e..4e1da0ae 100644
--- a/roles/fonts/tasks/main.yml
+++ b/roles/font/tasks/main.yml
@@ -13,7 +13,7 @@
   ansible.builtin.package:
     name: "{{ item }}"
     state: "present"
-  loop: "{{ fonts }}"
+  loop: "{{ font_packages }}"
 
 - name: "Ensure fontconfig global directory exists"
   become: true
diff --git a/roles/fonts/templates/local.conf.j2 b/roles/font/templates/local.conf.j2
index 33574afe..33574afe 100644
--- a/roles/fonts/templates/local.conf.j2
+++ b/roles/font/templates/local.conf.j2
diff --git a/roles/fonts/vars/archlinux.yml b/roles/font/vars/archlinux.yml
index 5ee5cedf..08ff03f0 100644
--- a/roles/fonts/vars/archlinux.yml
+++ b/roles/font/vars/archlinux.yml
@@ -1,5 +1,5 @@
 ---
-fonts:
+font_packages:
   - "ttf-jetbrains-mono-nerd"
   - "gnu-free-fonts"
   - "noto-fonts"
diff --git a/roles/font/vars/debian.yml b/roles/font/vars/debian.yml
new file mode 100644
index 00000000..fad50d6a
--- /dev/null
+++ b/roles/font/vars/debian.yml
@@ -0,0 +1,8 @@
+---
+font_packages:
+  - "fonts-jetbrains-mono"
+  - "fonts-recommended"
+  - "fonts-noto"
+  - "fonts-noto-cjk"
+  - "fonts-noto-emoji"
+  - "fonts-noto-extra"
diff --git a/roles/fonts/vars/debian.yml b/roles/fonts/vars/debian.yml
deleted file mode 100644
index d0568a1e..00000000
--- a/roles/fonts/vars/debian.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-fonts:
-  - "fonts-jetbrains-mono"
-  - "gnu-free-fonts"
-  - "noto-fonts"
-  - "noto-fonts-cjk"
-  - "noto-fonts-emoji"
-  - "noto-fonts-extra"
diff --git a/roles/hyprtheme/meta/main.yml b/roles/hyprtheme/meta/main.yml
index b0a348b6..126d1751 100644
--- a/roles/hyprtheme/meta/main.yml
+++ b/roles/hyprtheme/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
-  - role: "fonts"
+  - role: "font"
 galaxy_info:
   author: "a14m"
   description: "Install hyprland themes"
diff --git a/roles/waybar/meta/main.yml b/roles/waybar/meta/main.yml
index a17e7049..3a9129ab 100644
--- a/roles/waybar/meta/main.yml
+++ b/roles/waybar/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
-  - role: "fonts"
+  - role: "font"
   - role: "alacritty"
   - role: "btop"
   - role: "bluetui"