From c25993a37fb20b71821a59d2507168a0f30cc440 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Wed, 7 Aug 2024 21:59:25 -0400
Subject: [PATCH] rofi: migrate to font modules

---
 homeManagerModules/apps/fuzzel/default.nix   | 2 +-
 homeManagerModules/apps/kitty/default.nix    | 2 +-
 homeManagerModules/apps/rofi/default.nix     | 2 +-
 homeManagerModules/apps/vsCodium/default.nix | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeManagerModules/apps/fuzzel/default.nix b/homeManagerModules/apps/fuzzel/default.nix
index 6cbf7388..92d3bb40 100644
--- a/homeManagerModules/apps/fuzzel/default.nix
+++ b/homeManagerModules/apps/fuzzel/default.nix
@@ -15,7 +15,7 @@ in {
         };
 
         main = {
-          font = "${cfg.theme.monospaceFont.name}:size=${cfg.theme.monospaceFont.size}";
+          font = "${cfg.theme.monospaceFont.name}:size=${toString cfg.theme.monospaceFont.size}";
           icon-theme = "${config.gtk.iconTheme.name}";
           layer = "overlay";
           lines = 3;
diff --git a/homeManagerModules/apps/kitty/default.nix b/homeManagerModules/apps/kitty/default.nix
index e97f5074..f1aad0c0 100644
--- a/homeManagerModules/apps/kitty/default.nix
+++ b/homeManagerModules/apps/kitty/default.nix
@@ -11,7 +11,7 @@ in {
       enable = true;
 
       font = {
-        inherit (cfg.theme.monospaceFont) name;
+        name = cfg.theme.monospaceFont.name;
         size = cfg.theme.monospaceFont.size + 1;
       };
 
diff --git a/homeManagerModules/apps/rofi/default.nix b/homeManagerModules/apps/rofi/default.nix
index dab120c3..5a40cda9 100644
--- a/homeManagerModules/apps/rofi/default.nix
+++ b/homeManagerModules/apps/rofi/default.nix
@@ -15,7 +15,7 @@ in {
 
     programs.rofi = {
       enable = true;
-      font = "${cfg.theme.monospaceFont.name} ${cfg.theme.monospaceFont.size}";
+      font = "${cfg.theme.monospaceFont.name} ${toString cfg.theme.monospaceFont.size}";
       location = "center";
       package = pkgs.rofi-wayland;
 
diff --git a/homeManagerModules/apps/vsCodium/default.nix b/homeManagerModules/apps/vsCodium/default.nix
index 7cb4f8c9..faef544f 100644
--- a/homeManagerModules/apps/vsCodium/default.nix
+++ b/homeManagerModules/apps/vsCodium/default.nix
@@ -34,7 +34,7 @@ in {
 
       userSettings = {
         "diffEditor.ignoreTrimWhitespace" = false;
-        "editor.fontFamily" = "'${cfg.theme.monospaceFont.name} ${cfg.theme.monospaceFont.size}', 'monospace', monospace";
+        "editor.fontFamily" = "'${cfg.theme.monospaceFont.name} ${toString cfg.theme.monospaceFont.size}', 'monospace', monospace";
         "editor.fontSize" = lib.mkDefault 14;
         "editor.formatOnPaste" = true;
         "editor.formatOnSave" = true;