From 756cfaa3a81e32869de4d3044b67b8f5cb0ebc61 Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Fri, 6 Dec 2024 12:23:33 -0800 Subject: [PATCH] kitty: move macos fonts to module --- home/modules/kitty.nix | 31 +++++++++++++++++++++---------- hosts/little-lightning/home.nix | 4 ---- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/home/modules/kitty.nix b/home/modules/kitty.nix index 483b815..5b02376 100644 --- a/home/modules/kitty.nix +++ b/home/modules/kitty.nix @@ -14,17 +14,28 @@ in enable = true; shellIntegration.enableFishIntegration = true; - settings = { - font_family = "family=\"JetBrainsMono Nerd Font\" style=\"ExtraLight\""; - bold_font = "family=\"JetBrainsMono Nerd Font\" style=\"Light\""; - italic_font = "family=\"JetBrainsMono Nerd Font\" style=\"ExtraLight Italic\""; - bold_italic_font = "family=\"JetBrainsMono Nerd Font\" style=\"Light Italic\""; - background = "#050505"; - background_opacity = 0.98; - font_size = 12; + settings = + let + macos_fonts = { + font_family = lib.mkForce "family=\"JetBrainsMono Nerd Font Mono\" style=\"Light\""; + bold_font = lib.mkForce "family=\"JetBrainsMono Nerd Font Mono\" style=\"Regular\""; + italic_font = lib.mkForce "family=\"JetBrainsMono Nerd Font Mono\" style=\"Light Italic\""; + bold_italic_font = lib.mkForce "family=\"JetBrainsMono Nerd Font Mono\" style=\"Regular Italic\""; + }; + linux_fonts = { + font_family = "family=\"JetBrainsMono Nerd Font\" style=\"ExtraLight\""; + bold_font = "family=\"JetBrainsMono Nerd Font\" style=\"Light\""; + italic_font = "family=\"JetBrainsMono Nerd Font\" style=\"ExtraLight Italic\""; + bold_italic_font = "family=\"JetBrainsMono Nerd Font\" style=\"Light Italic\""; + }; + in + { + background = "#050505"; + background_opacity = 0.98; + font_size = 12; - # allow_remote_control = "yes"; - }; + # allow_remote_control = "yes"; + } // (if !macos then linux_fonts else macos_fonts); extraConfig = let diff --git a/hosts/little-lightning/home.nix b/hosts/little-lightning/home.nix index 6ad0391..b594ad9 100644 --- a/hosts/little-lightning/home.nix +++ b/hosts/little-lightning/home.nix @@ -40,10 +40,6 @@ # ''; programs.kitty.settings = { - font_family = lib.mkForce "family=\"JetBrainsMono Nerd Font Mono\" style=\"Light\""; - bold_font = lib.mkForce "family=\"JetBrainsMono Nerd Font Mono\" style=\"Regular\""; - italic_font = lib.mkForce "family=\"JetBrainsMono Nerd Font Mono\" style=\"Light Italic\""; - bold_italic_font = lib.mkForce "family=\"JetBrainsMono Nerd Font Mono\" style=\"Regular Italic\""; background_opacity = lib.mkForce 0.94; background = lib.mkForce "#171717"; font_size = lib.mkForce 16.0;