From 127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6 Mon Sep 17 00:00:00 2001
From: DCsunset <DCsunset@protonmail.com>
Date: Mon, 19 Aug 2024 23:58:10 +0000
Subject: [PATCH] i3/sway: support str type for font size

---
 .../window-managers/i3-sway/lib/options.nix   |  2 +-
 .../i3/i3-fonts-deprecated.nix                |  6 ++++-
 .../window-managers/i3/i3-fonts-expected.conf | 22 +++++++++++++++++++
 .../services/window-managers/i3/i3-fonts.nix  | 21 +++++++++++++-----
 4 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/modules/services/window-managers/i3-sway/lib/options.nix b/modules/services/window-managers/i3-sway/lib/options.nix
index 1f6820f5d..2869c2bf8 100644
--- a/modules/services/window-managers/i3-sway/lib/options.nix
+++ b/modules/services/window-managers/i3-sway/lib/options.nix
@@ -31,7 +31,7 @@ let
       };
 
       size = mkOption {
-        type = types.float;
+        type = types.either types.float types.str;
         default = 8.0;
         description = ''
           The font size to use for window titles.
diff --git a/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix b/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix
index 0216681f3..fefff9904 100644
--- a/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix
+++ b/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix
@@ -7,7 +7,10 @@
     enable = true;
 
     config = {
-      bars = [{ fonts = [ "FontAwesome" "Iosevka 11.500000" ]; }];
+      bars = [
+        { fonts = [ "FontAwesome" "Iosevka 11.500000" ]; }
+        { fonts = [ "FontAwesome" "Iosevka Bold Semi-Condensed 14px" ]; }
+      ];
       fonts = [ "DejaVuSansMono" "Terminus Bold Semi-Condensed 13.500000" ];
     };
   };
@@ -21,5 +24,6 @@
   test.asserts.warnings.expected = [
     "Specifying i3.config.fonts as a list is deprecated. Use the attrset version instead."
     "Specifying i3.config.bars[].fonts as a list is deprecated. Use the attrset version instead."
+    "Specifying i3.config.bars[].fonts as a list is deprecated. Use the attrset version instead."
   ];
 }
diff --git a/tests/modules/services/window-managers/i3/i3-fonts-expected.conf b/tests/modules/services/window-managers/i3/i3-fonts-expected.conf
index e2606b320..9ce876874 100644
--- a/tests/modules/services/window-managers/i3/i3-fonts-expected.conf
+++ b/tests/modules/services/window-managers/i3/i3-fonts-expected.conf
@@ -94,3 +94,25 @@ bar {
   }
 }
 
+bar {
+  font pango:FontAwesome, Iosevka Bold Semi-Condensed 14px
+  mode dock
+  hidden_state hide
+  position bottom
+  status_command @i3status@/bin/i3status
+  i3bar_command @i3@/bin/i3bar
+  workspace_buttons yes
+  strip_workspace_numbers no
+  tray_output primary
+  colors {
+    background #000000
+    statusline #ffffff
+    separator #666666
+    focused_workspace #4c7899 #285577 #ffffff
+    active_workspace #333333 #5f676a #ffffff
+    inactive_workspace #333333 #222222 #888888
+    urgent_workspace #2f343a #900000 #ffffff
+    binding_mode #2f343a #900000 #ffffff
+  }
+}
+
diff --git a/tests/modules/services/window-managers/i3/i3-fonts.nix b/tests/modules/services/window-managers/i3/i3-fonts.nix
index decd9fcca..061f7a0bd 100644
--- a/tests/modules/services/window-managers/i3/i3-fonts.nix
+++ b/tests/modules/services/window-managers/i3/i3-fonts.nix
@@ -7,12 +7,21 @@
     enable = true;
 
     config = {
-      bars = [{
-        fonts = {
-          names = [ "FontAwesome" "Iosevka" ];
-          size = 11.5;
-        };
-      }];
+      bars = [
+        {
+          fonts = {
+            names = [ "FontAwesome" "Iosevka" ];
+            size = 11.5;
+          };
+        }
+        {
+          fonts = {
+            names = [ "FontAwesome" "Iosevka" ];
+            style = "Bold Semi-Condensed";
+            size = "14px";
+          };
+        }
+      ];
       fonts = {
         names = [ "DejaVuSansMono" "Terminus" ];
         style = "Bold Semi-Condensed";