dunst: Use jetbrains mono

_machines/ares.yml

@@ -1,5 +1,4 @@
-font_size_1: 12
-font_size_2: 12
+font_size: 11
 
 gpu: amd
 cpu: amd

_machines/neptune.yml

@@ -1,5 +1,4 @@
-font_size_1: 12
-font_size_2: 12
+font_size: 12
 
 gpu: nvidia
 cpu: intel

alacritty/alacritty.toml.j2

@@ -9,7 +9,7 @@ TERM = "alacritty"
 WINIT_X11_SCALE_FACTOR = "1"
 
 [font]
-size = {{ machine.font_size_2 }}
+size = {{ machine.font_size }}
 
 [font.bold]
 family = "JetBrainsMono"

dunst/dunstrc.j2

@@ -84,7 +84,7 @@
 
     ### Text ###
 
-    font = DejaVu Sans {{ machine.font_size_1 }}
+    font = JetBrains Mono {{ machine.font_size }}
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.

gtk/gtk-3.0-bigger-font.ini.j2

@@ -1,7 +1,7 @@
 [Settings]
 gtk-theme-name=Breeze
 gtk-icon-theme-name=breeze
-gtk-font-name=DejaVu Sans {{ ((machine.font_size_1|int - 2)|float * 2.0) | round(0, 'floor') | int }}
+gtk-font-name=DejaVu Sans {{ ((machine.font_size|int - 2)|float * 2.0) | round(0, 'floor') | int }}
 gtk-cursor-theme-name=breeze_cursors
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH

gtk/gtk-3.0.ini.j2

@@ -1,7 +1,7 @@
 [Settings]
 gtk-theme-name=Breeze
 gtk-icon-theme-name=breeze
-gtk-font-name=DejaVu Sans {{ machine.font_size_1|int - 2 }}
+gtk-font-name=DejaVu Sans {{ machine.font_size|int - 2 }}
 gtk-cursor-theme-name=breeze_cursors
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH

gtk/gtkrc-2.0.j2

@@ -3,7 +3,7 @@
 
 gtk-theme-name="Breeze"
 gtk-icon-theme-name="breeze"
-gtk-font-name="DejaVu Sans {{ machine.font_size_1| int - 2 }}"
+gtk-font-name="DejaVu Sans {{ machine.font_size| int - 2 }}"
 gtk-cursor-theme-name="breeze_cursors"
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH

i3/config.j2

@@ -288,7 +288,7 @@ assign [class="^Wine$"] $workspace10
     floating_minimum_size 0 x 0
     floating_maximum_size 0 x 0
 
-    font pango:JetBrainsMono {{ machine.font_size_1 }}
+    font pango:JetBrainsMono {{ machine.font_size }}
 
 ################################################################################
 ### COLOR SETTINGS #############################################################
@@ -349,7 +349,7 @@ bar {
 
     id bar-0
 
-    font pango:JetBrainsMono, FontAwesome {{ machine.font_size_1 }}
+    font pango:JetBrainsMono, FontAwesome {{ machine.font_size }}
 
     colors {
         background #272822

packages.yml

@@ -56,26 +56,24 @@ arandr:
   archlinux: ["arandr"]
 docker:
   archlinux: ["docker", "docker-compose", "docker-buildx"]
-font-awesome:
+awesome-terminal-fonts:
   archlinux:
-    - ttf-font-awesome
-    - otf-font-awesome
     - awesome-terminal-fonts
 font-inconsolata:
-  archlinux: ["ttf-inconsolata"]
-font-jetbrainsmono:
-  archlinux: ["ttf-jetbrains-mono"]
-font-dejavu:
-  archlinux: ["ttf-dejavu"]
-font-libertine:
-  archlinux: ["ttf-linux-libertine"]
-font-emoji:
-  archlinux: ["noto-fonts-emoji"]
-fonts:
   archlinux:
-    - noto-fonts
-    - noto-fonts-extra
-    - noto-fonts-cjk
+    - ttf-inconsolata
+    - ttf-inconsolata-nerd
+font-jetbrainsmono:
+  archlinux:
+    - ttf-jetbrains-mono
+    - ttf-jetbrains-mono-nerd
+font-dejavu:
+  archlinux:
+    - ttf-dejavu
+    - ttf-dejavu-nerd
+font-libertine:
+  archlinux:
+    - ttf-linux-libertine
 git:
   # tk required for gitk
   archlinux: ["git", "tk", "git-delta", "git-filter-repo"]