From da3762a3b09545b2747fb7ae90d74f9c9854e7e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Sun, 26 May 2024 12:49:46 +0200
Subject: [PATCH] Use single font size

---
 _machines/ares.yml             | 3 +--
 _machines/neptune.yml          | 3 +--
 alacritty/alacritty.toml.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 ++--
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/_machines/ares.yml b/_machines/ares.yml
index 496ccc6..c8daf8a 100644
--- a/_machines/ares.yml
+++ b/_machines/ares.yml
@@ -1,5 +1,4 @@
-font_size_1: 11
-font_size_2: 11
+font_size: 11
 
 gpu: amd
 cpu: amd
diff --git a/_machines/neptune.yml b/_machines/neptune.yml
index 661a7e0..b828888 100644
--- a/_machines/neptune.yml
+++ b/_machines/neptune.yml
@@ -1,5 +1,4 @@
-font_size_1: 12
-font_size_2: 12
+font_size: 12
 
 gpu: nvidia
 cpu: intel
diff --git a/alacritty/alacritty.toml.j2 b/alacritty/alacritty.toml.j2
index 3841504..7c8f51b 100644
--- a/alacritty/alacritty.toml.j2
+++ b/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"
diff --git a/dunst/dunstrc.j2 b/dunst/dunstrc.j2
index 7427f51..5ed1bc2 100644
--- a/dunst/dunstrc.j2
+++ b/dunst/dunstrc.j2
@@ -84,7 +84,7 @@
 
     ### Text ###
 
-    font = DejaVu Sans {{ machine.font_size_1 }}
+    font = DejaVu Sans {{ machine.font_size }}
 
     # 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 89d902f..2653b5f 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_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
diff --git a/gtk/gtk-3.0.ini.j2 b/gtk/gtk-3.0.ini.j2
index 6599243..404c31b 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_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
diff --git a/gtk/gtkrc-2.0.j2 b/gtk/gtkrc-2.0.j2
index dd928c0..c335067 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_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
diff --git a/i3/config.j2 b/i3/config.j2
index 72ef916..f577da9 100644
--- a/i3/config.j2
+++ b/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 {{ machine.font_size_1 }}
+    font pango:JetBrainsMono {{ machine.font_size }}
 
     colors {
         background #272822