refactor styles to new color scheme basis

1 files changed, 29 insertions, 37 deletions

diff --git a/nix/programs/kitty/default.nix b/nix/programs/kitty/default.nix
index 34534fb..994da43 100644
--- a/nix/programs/kitty/default.nix
+++ b/nix/programs/kitty/default.nix
@@ -39,47 +39,39 @@
         confirm_os_window_close = 0;
 
         # colors
-        background = "#${config.theme.colors.base00}";
-        foreground = "#${config.theme.colors.base05}";
-        selection_background = "#${config.theme.colors.base05}";
-        selection_foreground = "#${config.theme.colors.base00}";
-        url_color = "#${config.theme.colors.base04}";
-        cursor = "#${config.theme.colors.base05}";
-        active_border_color = "#${config.theme.colors.base03}";
-        inactive_border_color = "#${config.theme.colors.base01}";
-        active_tab_background = "#${config.theme.colors.base00}";
-        active_tab_foreground = "#${config.theme.colors.base05}";
-        inactive_tab_background = "#${config.theme.colors.base01}";
-        inactive_tab_foreground = "#${config.theme.colors.base04}";
-        tab_bar_background = "#${config.theme.colors.base01}";
+        background = "#${config.theme.colors.bg}";
+        foreground = "#${config.theme.colors.fg}";
+        selection_background = "#${config.theme.colors.surface.bg}";
+        selection_foreground = "#${config.theme.colors.surface.fg}";
+        url_color = "#${config.theme.colors.bright.yellow}";
+        cursor = "#${config.theme.colors.fg}";
+        active_border_color = "#${config.theme.colors.primary}";
+        inactive_border_color = "#${config.theme.colors.bg}";
+        active_tab_background = "#${config.theme.colors.bg}";
+        active_tab_foreground = "#${config.theme.colors.fg}";
+        inactive_tab_background = "#${config.theme.colors.bg}";
+        inactive_tab_foreground = "#${config.theme.colors.fg}";
+        tab_bar_background = "#${config.theme.colors.bg}";
 
         # normal
-        color0 = "#${config.theme.colors.base00}";
-        color1 = "#${config.theme.colors.base08}";
-        color2 = "#${config.theme.colors.base0B}";
-        color3 = "#${config.theme.colors.base0A}";
-        color4 = "#${config.theme.colors.base0D}";
-        color5 = "#${config.theme.colors.base0E}";
-        color6 = "#${config.theme.colors.base0C}";
-        color7 = "#${config.theme.colors.base05}";
+        color0 = "#${config.theme.colors.normal.black}";
+        color1 = "#${config.theme.colors.normal.red}";
+        color2 = "#${config.theme.colors.normal.green}";
+        color3 = "#${config.theme.colors.normal.yellow}";
+        color4 = "#${config.theme.colors.normal.blue}";
+        color5 = "#${config.theme.colors.normal.magenta}";
+        color6 = "#${config.theme.colors.normal.cyan}";
+        color7 = "#${config.theme.colors.normal.white}";
 
         # bright
-        color8 = "#${config.theme.colors.base03}";
-        color9 = "#${config.theme.colors.base08}";
-        color10 = "#${config.theme.colors.base0B}";
-        color11 = "#${config.theme.colors.base0A}";
-        color12 = "#${config.theme.colors.base0D}";
-        color13 = "#${config.theme.colors.base0E}";
-        color14 = "#${config.theme.colors.base0C}";
-        color15 = "#${config.theme.colors.base07}";
-
-        # extended base16 colors
-        color16 = "#${config.theme.colors.base09}";
-        color17 = "#${config.theme.colors.base0F}";
-        color18 = "#${config.theme.colors.base01}";
-        color19 = "#${config.theme.colors.base02}";
-        color20 = "#${config.theme.colors.base04}";
-        color21 = "#${config.theme.colors.base06}";
+        color8 = "#${config.theme.colors.bright.black}";
+        color9 = "#${config.theme.colors.bright.red}";
+        color10 = "#${config.theme.colors.bright.green}";
+        color11 = "#${config.theme.colors.bright.yellow}";
+        color12 = "#${config.theme.colors.bright.blue}";
+        color13 = "#${config.theme.colors.bright.magenta}";
+        color14 = "#${config.theme.colors.bright.cyan}";
+        color15 = "#${config.theme.colors.bright.white}";
       };
     };
   };