update colorschemes

1 files changed, 61 insertions, 48 deletions

diff --git a/modules/options.nix b/modules/options.nix
index 62b4ae5..78b7776 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -41,36 +41,29 @@ with lib; let
         description = "Author of the theme";
       };
 
-      fg = mkOption {
+      text = mkOption {
         type = types.str;
-        description = "Text color";
+        description = "Text color.";
       };
 
-      bg = mkOption {
+      subtext = mkOption {
         type = types.str;
-        description = "Background color";
+        description = "Subtext color.";
       };
 
-      surface = {
-        fg = mkOption {
-          type = types.str;
-          description = "Surface text color";
-        };
-        bg = mkOption {
-          type = types.str;
-          description = "Surface background color";
-        };
+      base = mkOption {
+        type = types.str;
+        description = "Base background color.";
       };
 
-      hover = {
-        fg = mkOption {
-          type = types.str;
-          description = "Hover text color";
-        };
-        bg = mkOption {
-          type = types.str;
-          description = "Hover background color";
-        };
+      surface = mkOption {
+        type = types.str;
+        description = "Surface (lighter) background color.";
+      };
+
+      overlay = mkOption {
+        type = types.str;
+        description = "Overlay (light) background color.";
       };
 
       primary = mkOption {
@@ -96,84 +89,104 @@ with lib; let
       normal = {
         black = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal black normal color";
         };
 
-        blue = mkOption {
+        red = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal red normal color";
         };
 
-        cyan = mkOption {
+        green = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal green normal color";
         };
 
-        green = mkOption {
+        yellow = mkOption {
+          type = types.str;
+          description = "Terminal yellow normal color";
+        };
+
+        blue = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal blue normal color";
         };
 
         magenta = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal magenta normal color";
         };
 
-        red = mkOption {
+        cyan = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal cyan normal color";
         };
 
         white = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal white normal color";
         };
 
-        yellow = mkOption {
+        pink = mkOption {
+          type = types.str;
+          description = "Terminal pink (extended) normal color.";
+        };
+
+        orange = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal orange (extended) normal color.";
         };
       };
 
       bright = {
         black = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal black bright color";
         };
 
-        blue = mkOption {
+        red = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal red bright color";
         };
 
-        cyan = mkOption {
+        green = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal green bright color";
         };
 
-        green = mkOption {
+        yellow = mkOption {
+          type = types.str;
+          description = "Terminal yellow bright color";
+        };
+
+        blue = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal blue bright color";
         };
 
         magenta = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal magenta bright color";
         };
 
-        red = mkOption {
+        cyan = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal cyan bright color";
         };
 
         white = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal white bright color";
         };
 
-        yellow = mkOption {
+        pink = mkOption {
+          type = types.str;
+          description = "Terminal pink (extended) bright color.";
+        };
+
+        orange = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal orange (extended) bright color.";
         };
       };
     };