From e3a8bbe8535cc0edc2ceeb6151250d4a402809ee Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Sun, 17 Nov 2024 14:23:24 +0100
Subject: [PATCH] Update kitty config

---
 modules/programs/fish.nix  | 10 ++++++++++
 modules/programs/kitty.nix | 37 +++++++++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index ca9e628..722b101 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -1,9 +1,15 @@
 {
   lib,
+  pkgs,
+  inputs,
   config,
   options,
   ...
 }:
+let
+  base16 = pkgs.callPackage inputs.base16.lib { };
+  scheme = (base16.mkSchemeAttrs config.stylix.base16Scheme);
+in
 {
   options.mods.fish = {
     enable = lib.mkOption {
@@ -67,6 +73,10 @@
               abbr --add cd 'z'
               abbr --add y 'yazi'
 
+              set fish_color_autosuggestion '${scheme.base07}'
+              set fish_color_param '${scheme.base06}'
+              set fish_color_operator '${scheme.base0E}'
+
               set fish_greeting
               # pwd based on the value of _ZO_RESOLVE_SYMLINKS.
               function __zoxide_pwd
diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index 335c132..56b8126 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -88,23 +88,48 @@ in
           inactive_tab_foreground = "#" + scheme.base04;
           tab_bar_background = "#" + scheme.base01;
 
-          color0 = base;
+          mark1_foreground = "#" + scheme.base00;
+          mark1_background = "#" + scheme.base07;
+          mark2_foreground = "#" + scheme.base00;
+          mark2_background = "#" + scheme.base0E;
+          mark3_foreground = "#" + scheme.base00;
+          mark3_background = "#" + scheme.base08;
+
+          color0 = "#" + scheme.base03;
           color1 = "#" + scheme.base08;
           color2 = "#" + scheme.base0B;
           color3 = "#" + scheme.base0A;
           color4 = "#" + scheme.base0D;
-          color5 = "#" + scheme.base0E;
+          color5 = "#" + scheme.base06;
           color6 = "#" + scheme.base0C;
-          color7 = "#" + scheme.base05;
+          color7 = "#" + scheme.base07;
 
-          color8 = "#" + scheme.base03;
+          color8 = "#" + scheme.base04;
           color9 = "#" + scheme.base08;
           color10 = "#" + scheme.base0B;
           color11 = "#" + scheme.base0A;
           color12 = "#" + scheme.base0D;
-          color13 = "#" + scheme.base0E;
+          color13 = "#" + scheme.base06;
           color14 = "#" + scheme.base0C;
-          color15 = "#" + scheme.base07;
+          color15 = "#" + scheme.base0B;
+
+          # color0 = base;
+          # color1 = "#" + scheme.base08;
+          # color2 = "#" + scheme.base0B;
+          # color3 = "#" + scheme.base0A;
+          # color4 = "#" + scheme.base0D;
+          # color5 = "#" + scheme.base0E;
+          # color6 = "#" + scheme.base0C;
+          # color7 = "#" + scheme.base05;
+          #
+          # color8 = "#" + scheme.base03;
+          # color9 = "#" + scheme.base08;
+          # color10 = "#" + scheme.base0B;
+          # color11 = "#" + scheme.base0A;
+          # color12 = "#" + scheme.base0D;
+          # color13 = "#" + scheme.base0E;
+          # color14 = "#" + scheme.base0C;
+          # color15 = "#" + scheme.base07;
 
           shell = lib.mkIf config.mods.fish.enable "fish";
         } // config.mods.kitty.additionalConfig;