2 files changed, 49 insertions, 31 deletions
diff --git a/modules/terminal/alacritty.nix b/modules/terminal/alacritty.nix
index 7dd4456..7addff0 100644
--- a/modules/terminal/alacritty.nix
+++ b/modules/terminal/alacritty.nix
@@ -48,25 +48,46 @@ in {
           };
 
           # Colors
-          colors =
-            (lib.attrsets.mapAttrs (
-              group: colors:
-                lib.attrsets.mapAttrs (name: color: "#${color}") colors
-            ) {inherit (config.theme.colors) bright normal;})
-            // {
-              cursor = {
-                background = "CellForeground";
-                text = "CellBackground";
-              };
-              selection = {
-                background = "CellForeground";
-                text = "CellBackground";
-              };
-              primary = {
-                foreground = "#${config.theme.colors.fg}";
-                background = "#${config.theme.colors.bg}";
-              };
+          colors = {
+            normal = lib.attrsets.mapAttrs (name: color: "${color}") {
+              inherit (config.theme.colors.normal)
+                black
+                red
+                green
+                yellow
+                blue
+                magenta
+                cyan
+                white;
             };
+
+            bright = lib.attrsets.mapAttrs (name: color: "${color}") {
+              inherit (config.theme.colors.bright)
+                black
+                red
+                green
+                yellow
+                blue
+                magenta
+                cyan
+                white;
+            };
+
+            cursor = {
+              background = "CellForeground";
+              text = "CellBackground";
+            };
+
+            selection = {
+              background = "CellForeground";
+              text = "CellBackground";
+            };
+
+            primary = {
+              foreground = "#${config.theme.colors.text}";
+              background = "#${config.theme.colors.base}";
+            };
+          };
         };
       };
     };
diff --git a/modules/terminal/kitty.nix b/modules/terminal/kitty.nix
index 88aa151..cee0e72 100644
--- a/modules/terminal/kitty.nix
+++ b/modules/terminal/kitty.nix
@@ -43,20 +43,17 @@ in {
           # Disable close prompt
           confirm_os_window_close = 0;
 
-          # colors
-          background = "#${config.theme.colors.bg}";
-          foreground = "#${config.theme.colors.fg}";
-          selection_background = "#${config.theme.colors.surface.bg}";
-          selection_foreground = "#${config.theme.colors.surface.fg}";
+          # selection
+          selection_background = "#${config.theme.colors.surface}";
+          selection_foreground = "none";
+
+          # cursor
           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}";
+          cursor = "#${config.theme.colors.text}";
+
+          # colors
+          background = "#${config.theme.colors.base}";
+          foreground = "#${config.theme.colors.text}";
 
           # normal
           color0 = "#${config.theme.colors.normal.black}";