update colorschemes

5 files changed, 39 insertions, 35 deletions

diff --git a/themes/catppuccin/frappe.nix b/themes/catppuccin/frappe.nix
index 9b2c006..5312418 100644
--- a/themes/catppuccin/frappe.nix
+++ b/themes/catppuccin/frappe.nix
@@ -2,14 +2,12 @@ rec {
   name = "Catppuccin Frappe";
   author = "https://github.com/catppuccin/catppuccin";
 
-  fg = "c6d0f5";
-  bg = "303446";
+  text = "c6d0f5";
+  subtext = "b5bfe2";
 
-  surface.fg = fg;
-  surface.bg = "414559";
-
-  hover.fg = fg;
-  hover.bg = "737994";
+  base = "303446";
+  surface = "414559";
+  overlay = "737994";
 
   primary = normal.blue;
   success = normal.green;
@@ -25,6 +23,7 @@ rec {
     magenta = "f4b8e4";
     cyan = "81c8be";
     white = "b5bfe2";
+    orange = "ef9f76";
   };
 
   bright = {
@@ -36,5 +35,6 @@ rec {
     magenta = "f4b8e4";
     cyan = "81c8be";
     white = "a5adce";
+    orange = "ef9f76";
   };
 }
diff --git a/themes/catppuccin/latte.nix b/themes/catppuccin/latte.nix
index 0378da8..0ac5185 100644
--- a/themes/catppuccin/latte.nix
+++ b/themes/catppuccin/latte.nix
@@ -2,14 +2,12 @@ rec {
   name = "Catppuccin Latte";
   author = "https://github.com/catppuccin/catppuccin";
 
-  fg = "4c4f69";
-  bg = "eff1f5";
+  text = "4c4f69";
+  subtext = "5c5f77";
 
-  surface.fg = fg;
-  surface.bg = "ccd0da";
-
-  hover.fg = fg;
-  hover.bg = "9ca0b0";
+  base = "eff1f5";
+  surface = "ccd0da";
+  overlay = "9ca0b0";
 
   primary = normal.blue;
   success = normal.green;
@@ -25,6 +23,7 @@ rec {
     magenta = "ea76cb";
     cyan = "179299";
     white = "5c5f77";
+    orange = "fe640b";
   };
 
   bright = {
@@ -36,5 +35,6 @@ rec {
     magenta = "ea76cb";
     cyan = "179299";
     white = "6c6f85";
+    orange = "fe640b";
   };
 }
diff --git a/themes/catppuccin/macchiato.nix b/themes/catppuccin/macchiato.nix
index 46f17b5..f90a6da 100644
--- a/themes/catppuccin/macchiato.nix
+++ b/themes/catppuccin/macchiato.nix
@@ -2,14 +2,12 @@ rec {
   name = "Catppuccin Macchiato";
   author = "https://github.com/catppuccin/catppuccin";
 
-  fg = "cad3f5";
-  bg = "1e1e2e";
+  text = "cad3f5";
+  subtext = "b8c0e0";
 
-  surface.fg = fg;
-  surface.bg = "313244";
-
-  hover.fg = fg;
-  hover.bg = "24273a";
+  base = "24273a";
+  surface = "363a4f";
+  overlay = "6e738d";
 
   primary = normal.blue;
   success = normal.green;
@@ -25,6 +23,7 @@ rec {
     magenta = "f5bde6";
     cyan = "8bd5ca";
     white = "b8c0e0";
+    orange = "f5a97f";
   };
 
   bright = {
@@ -36,5 +35,6 @@ rec {
     magenta = "f5bde6";
     cyan = "8bd5ca";
     white = "a5adcb";
+    orange = "f5a97f";
   };
 }
diff --git a/themes/catppuccin/mocha.nix b/themes/catppuccin/mocha.nix
index 3115d00..2abcebb 100644
--- a/themes/catppuccin/mocha.nix
+++ b/themes/catppuccin/mocha.nix
@@ -2,14 +2,12 @@ rec {
   name = "Catppuccin Mocha";
   author = "https://github.com/catppuccin/catppuccin";
 
-  fg = "cdd6f4";
-  bg = "1e1e2e";
+  text = "cdd6f4";
+  subtext = "bac2de";
 
-  surface.fg = fg;
-  surface.bg = "313244";
-
-  hover.fg = fg;
-  hover.bg = "6c7086";
+  base = "1e1e2e";
+  surface = "313244";
+  overlay = "6c7086";
 
   primary = normal.blue;
   success = normal.green;
@@ -25,6 +23,8 @@ rec {
     magenta = "ca9ee6";
     cyan = "94e2d5";
     white = "bac2de";
+    pink = "f5c2e7";
+    orange = "fab387";
   };
 
   bright = {
@@ -36,5 +36,7 @@ rec {
     magenta = "ca9ee6";
     cyan = "94e2d5";
     white = "a6adc8";
+    pink = "f5c2e7";
+    orange = "fab387";
   };
 }
diff --git a/themes/tricolors.nix b/themes/tricolors.nix
index 286994e..4f8f551 100644
--- a/themes/tricolors.nix
+++ b/themes/tricolors.nix
@@ -2,14 +2,12 @@ rec {
   name = "tricolors";
   author = "https://trimill.xyz";
 
-  fg = bright.white;
-  bg = normal.black;
+  text = bright.white;
+  subtext = normal.white;
 
-  surface.fg = fg;
-  surface.bg = "2c2b3b";
-
-  hover.fg = fg;
-  hover.bg = bright.black;
+  base = normal.black;
+  surface = "2c2b3b";
+  overlay = bright.black;
 
   primary = bright.blue;
   success = bright.green;
@@ -25,6 +23,8 @@ rec {
     red = "a63a3a";
     white = "ada0a8";
     yellow = "de7e54";
+    pink = normal.magenta;
+    orange = normal.yellow;
   };
 
   bright = {
@@ -36,5 +36,7 @@ rec {
     red = "cc5c5c";
     white = "c7c6c3";
     yellow = "f0c767";
+    pink = bright.magenta;
+    orange = bright.yellow;
   };
 }