From ea37c6ec60b3d363326f675373ddebb7558e64f7 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Thu, 24 Sep 2026 07:30:38 +1000 Subject: [PATCH] fix: conflicting theme options --- modules/features/terminal/kitty.nix | 8 ++++---- modules/themes/theme.nix | 21 ++++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/modules/features/terminal/kitty.nix b/modules/features/terminal/kitty.nix index 0e9a287..a7f0cc2 100644 --- a/modules/features/terminal/kitty.nix +++ b/modules/features/terminal/kitty.nix @@ -36,10 +36,10 @@ shellIntegration.enableFishIntegration = true; # font settings - font = { - name = "spleen 32x64"; - size = 12; - }; + #font = { + #name = "spleen 32x64"; + #size = 12; + #}; # kitty settings settings = { diff --git a/modules/themes/theme.nix b/modules/themes/theme.nix index 6a342cb..4d072a5 100644 --- a/modules/themes/theme.nix +++ b/modules/themes/theme.nix @@ -43,12 +43,12 @@ fonts = { # point sizes for various ui elements - #sizes = { - #terminal = 10; - #desktop = 10; - #popups = 10; - #applications = 12; - #}; + sizes = { + terminal = 12; + desktop = 12; + popups = 12; + applications = 12; + }; # emoji font to use emoji = { @@ -57,9 +57,12 @@ }; # text fonts to use - #monospace = { }; - #serif = config.stylix.fonts.sansSerif; - #sansSerif = { }; + monospace = { + package = with pkgs; spleen; + name = "Spleen 32x64"; + }; + serif = config.stylix.fonts.monospace; + sansSerif = config.stylix.fonts.monospace; }; };