From e2ae922a85f195e5f5a41a01af19ca683273f89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Fri, 16 Dec 2022 19:08:39 +0100
Subject: [PATCH] Split font sizes into different "kinds"(?)

---
 _machines/ares.yml             | 3 ++-
 _machines/mars.yml             | 3 ++-
 _machines/neptune.yml          | 3 ++-
 alacritty/alacritty.yml.j2     | 2 +-
 dunst/dunstrc.j2               | 2 +-
 gtk/gtk-3.0-bigger-font.ini.j2 | 2 +-
 gtk/gtk-3.0.ini.j2             | 2 +-
 gtk/gtkrc-2.0.j2               | 2 +-
 i3/config.j2                   | 4 ++--
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/_machines/ares.yml b/_machines/ares.yml
index 1b39f72..40c2a18 100644
--- a/_machines/ares.yml
+++ b/_machines/ares.yml
@@ -1,4 +1,5 @@
-font_size: 12
+font_size_1: 12
+font_size_2: 12
 
 gpu: amd
 
diff --git a/_machines/mars.yml b/_machines/mars.yml
index b9a6c25..4783f14 100644
--- a/_machines/mars.yml
+++ b/_machines/mars.yml
@@ -1,4 +1,5 @@
-font_size: 12
+font_size_1: 12
+font_size_2: 9
 
 users:
 - name: hannes-work
diff --git a/_machines/neptune.yml b/_machines/neptune.yml
index e643fd4..fea89f9 100644
--- a/_machines/neptune.yml
+++ b/_machines/neptune.yml
@@ -1,4 +1,5 @@
-font_size: 12
+font_size_1: 12
+font_size_2: 9
 
 users:
 - name: hannes-work
diff --git a/alacritty/alacritty.yml.j2 b/alacritty/alacritty.yml.j2
index 2661a1b..b94c756 100644
--- a/alacritty/alacritty.yml.j2
+++ b/alacritty/alacritty.yml.j2
@@ -150,7 +150,7 @@ font:
     style: Bold Italic
 
   # Point size
-  size: {{ machine.font_size }}
+  size: {{ machine.font_size_2 }}
 
   # Offset is the extra space around each character. `offset.y` can be thought
   # of as modifying the line spacing, and `offset.x` as modifying the letter
diff --git a/dunst/dunstrc.j2 b/dunst/dunstrc.j2
index 5ed1bc2..7427f51 100644
--- a/dunst/dunstrc.j2
+++ b/dunst/dunstrc.j2
@@ -84,7 +84,7 @@
 
     ### Text ###
 
-    font = DejaVu Sans {{ machine.font_size }}
+    font = DejaVu Sans {{ machine.font_size_1 }}
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
diff --git a/gtk/gtk-3.0-bigger-font.ini.j2 b/gtk/gtk-3.0-bigger-font.ini.j2
index 2653b5f..89d902f 100644
--- a/gtk/gtk-3.0-bigger-font.ini.j2
+++ b/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|int - 2)|float * 2.0) | round(0, 'floor') | int }}
+gtk-font-name=DejaVu Sans {{ ((machine.font_size_1|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
diff --git a/gtk/gtk-3.0.ini.j2 b/gtk/gtk-3.0.ini.j2
index 404c31b..6599243 100644
--- a/gtk/gtk-3.0.ini.j2
+++ b/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|int - 2 }}
+gtk-font-name=DejaVu Sans {{ machine.font_size_1|int - 2 }}
 gtk-cursor-theme-name=breeze_cursors
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
diff --git a/gtk/gtkrc-2.0.j2 b/gtk/gtkrc-2.0.j2
index c335067..dd928c0 100644
--- a/gtk/gtkrc-2.0.j2
+++ b/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| int - 2 }}"
+gtk-font-name="DejaVu Sans {{ machine.font_size_1| int - 2 }}"
 gtk-cursor-theme-name="breeze_cursors"
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
diff --git a/i3/config.j2 b/i3/config.j2
index 76de3e4..87dfcbb 100644
--- a/i3/config.j2
+++ b/i3/config.j2
@@ -292,7 +292,7 @@ assign [class="^Wine$"] $workspace10
     floating_minimum_size 0 x 0
     floating_maximum_size 0 x 0
 
-    font pango:Inconsolata {{ machine.font_size }}
+    font pango:Inconsolata {{ machine.font_size_1 }}
 
 ################################################################################
 ### COLOR SETTINGS #############################################################
@@ -353,7 +353,7 @@ bar {
 
     id bar-0
 
-    font pango:Inconsolata, FontAwesome {{ machine.font_size }}
+    font pango:Inconsolata, FontAwesome {{ machine.font_size_1 }}
 
     colors {
         background #272822