From 351584ecb493d48f6c358e58b3edf7168a659a4e Mon Sep 17 00:00:00 2001 From: DashieTM Date: Sun, 25 Aug 2024 21:48:46 +0200 Subject: [PATCH] Add more kitty configuration values --- example/hosts/example/hardware.nix | 4 +++- example/hosts/example/home.nix | 4 +++- modules/programs/fish.nix | 1 - modules/programs/kitty.nix | 23 ++++++++++++++++------- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/example/hosts/example/hardware.nix b/example/hosts/example/hardware.nix index ffcd441..855cafb 100644 --- a/example/hosts/example/hardware.nix +++ b/example/hosts/example/hardware.nix @@ -1 +1,3 @@ -{ } +{ + # this file adds custom NixOS configuration +} diff --git a/example/hosts/example/home.nix b/example/hosts/example/home.nix index ffcd441..e011ea7 100644 --- a/example/hosts/example/home.nix +++ b/example/hosts/example/home.nix @@ -1 +1,3 @@ -{ } +{ + # this file adds custom home-manager configuration +} diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix index 54e6f67..21ea5ee 100644 --- a/modules/programs/fish.nix +++ b/modules/programs/fish.nix @@ -2,7 +2,6 @@ lib, config, options, - pkgs, ... }: { diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix index b7bac45..a837613 100644 --- a/modules/programs/kitty.nix +++ b/modules/programs/kitty.nix @@ -27,6 +27,7 @@ let "e" = "d"; "f" = "e"; }; + # don't ask :) base = "#" + lib.strings.concatStrings ( @@ -42,6 +43,15 @@ in type = lib.types.bool; description = "Enables kitty"; }; + additionalConfig = lib.mkOption { + default = { }; + example = { + # for the insane people out there :P + enable_audio_bell = "yes"; + }; + type = with lib.types; attrsOf anything; + description = "Additional kitty configuration"; + }; }; config = lib.mkIf config.mods.kitty.enable ( lib.optionalAttrs (options ? home.packages) { @@ -59,10 +69,10 @@ in sync_with_monitor = "no"; background_opacity = "0.8"; - font_family = "JetBrainsMono Nerd Font Mono"; - bold_font = "JetBrainsMono Nerd Font Mono Extra Bold"; - italic_font = "JetBrainsMono Nerd Font Mono Extra Italic"; - bold_italic_font = "JetBrainsMono Nerd Font Mono Extra Bold Italic"; + font_family = "${config.mods.stylix.monospace.name}"; + bold_font = "${config.mods.stylix.monospace.name} Extra Bold"; + italic_font = "${config.mods.stylix.monospace.name} Extra Italic"; + bold_italic_font = "${config.mods.stylix.monospace.name} Extra Bold Italic"; background = base; foreground = "#" + scheme.base05; @@ -96,9 +106,8 @@ in color14 = "#" + scheme.base0C; color15 = "#" + scheme.base07; - shell = "fish"; - }; - + shell = lib.mkIf config.mods.fish.enable "fish"; + } // config.mods.kitty.additionalConfig; }; } );