many changes

4 files changed, 70 insertions, 30 deletions

diff --git a/modules/colors/bright.nix b/modules/colors/bright.nix
new file mode 100644
index 0000000..2b0a18a
--- /dev/null
+++ b/modules/colors/bright.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.modules.colors.bright;
+  hexColorRegex = ''#([0-9a-fA-F]{3}){1,2}'';
+  hexColor = {
+    type = lib.types.strMatching hexColorRegex;
+  };
+in
+{
+  options.modules.colors.bright = {
+    enable = lib.mkEnableOption "bright theme";
+  };
+  config = lib.mkIf cfg.enable {
+    modules.scheme = {
+      name = "base16-bright";
+      base00 = "#000000";
+      base01 = "#303030";
+      base02 = "#505050";
+      base03 = "#b0b0b0";
+      base04 = "#d0d0d0";
+      base05 = "#e0e0e0";
+      base06 = "#f5f5f5";
+      base07 = "#ffffff";
+      base08 = "#fb0120";
+      base09 = "#fc6d24";
+      base0A = "#fda331";
+      base0B = "#a1c659";
+      base0C = "#76c7b7";
+      base0D = "#6fb3d2";
+      base0E = "#d381c3";
+      base0F = "#be643c";
+    };
+  };
+}
diff --git a/modules/colors/default.nix b/modules/colors/default.nix
index 428600f..2bc069d 100644
--- a/modules/colors/default.nix
+++ b/modules/colors/default.nix
@@ -7,5 +7,7 @@
     ./google-dark.nix
     ./grayscale-light.nix
     ./grayscale-dark.nix
+    ./evenok-dark.nix
+    ./bright.nix
   ];
 }
diff --git a/modules/colors/evenok-dark.nix b/modules/colors/evenok-dark.nix
new file mode 100644
index 0000000..33c0f86
--- /dev/null
+++ b/modules/colors/evenok-dark.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.modules.colors.evenok-dark;
+  hexColorRegex = ''#([0-9a-fA-F]{3}){1,2}'';
+  hexColor = {
+    type = lib.types.strMatching hexColorRegex;
+  };
+in
+{
+  options.modules.colors.evenok-dark = {
+    enable = lib.mkEnableOption "evenok-dark theme";
+  };
+  config = lib.mkIf cfg.enable {
+    modules.scheme = {
+      name = "base16-evenok-dark";
+        base00 = "#000000";
+        base01 = "#202020";
+        base02 = "#303030";
+        base03 = "#505050";
+        base04 = "#b0b0b0";
+        base05 = "#d0d0d0";
+        base06 = "#e0e0e0";
+        base07 = "#ffffff";
+        base08 = "#f5708a";
+        base09 = "#ee8122";
+        base0A = "#b8a300";
+        base0B = "#54bc5c";
+        base0C = "#00bab3";
+        base0D = "#00aff2";
+        base0E = "#9095ff";
+        base0F = "#d47ada";
+    };
+  };
+}
diff --git a/modules/colors/mountain.nix b/modules/colors/mountain.nix
index 7a8e9fa..881a1f4 100644
--- a/modules/colors/mountain.nix
+++ b/modules/colors/mountain.nix
@@ -30,36 +30,6 @@ in
       base0D = "#8f8aac";
       base0E = "#ac8aac";
       base0F = "#ac8a8c";
-      # extraVimConfig = 
-      # ''
-      #   hi LineNr guifg=#ceb188
-      #   hi LineNrAbove guifg=#262626
-      #   hi LineNrBelow guifg=#262626
-      #   hi CursorLineNr guifg=#ceb188 guibg=#191919 gui=bold
-      #   hi FloatBorder guifg=#4c4c4c
-      #   hi Pmenu guibg=#0d0d0d
-      #   hi BlinkCmpMenuBorder guifg=#4c4c4c 
-      #   hi BlinkCmpDocBorder guifg=#4c4c4c 
-      #   hi PmenuSel guibg=#191919 guifg=#cacaca
-      #   hi WinBar guifg=#4c4c4c
-      #   hi WinSeparator guifg=#191919
-      #   "
-      #   "" status line
-      #   hi StatusLine guibg=#191919 guifg=#4c4c4c
-      #   hi StatuslineInactive guibg=#191919 guifg=#4c4c4c gui=NONE
-      #   hi StatuslineAccent guifg=#0f0f0f guibg=#aca98a gui=bold
-      #   hi StatuslineInsertAccent guifg=#0f0f0f guibg=#8aabac gui=bold
-      #   hi StatuslineVisualAccent guifg=#0f0f0f guibg=#8f8aac gui=bold
-      #   hi StatuslineReplaceAccent guifg=#0f0f0f guibg=#ac8a8c gui=bold
-      #   hi StatuslineTerminalAccent guifg=#0f0f0f guibg=#ac8a8c gui=bold
-      #   hi StatuslineCommandAccent guifg=#0f0f0f guibg=#8aac8b gui=bold
-      #   hi StatuslineFileIcon guibg=#191919 guifg=#8f8aac
-      #   hi StatuslineInfo guibg=#191919 guifg=#4c4c4c 
-      #   hi LspError guibg=#191919 guifg=#c49ea0
-      #   hi LspWarn guibg=#191919 guifg=#8f8aac
-      #   hi LspInfo guibg=#191919 guifg=#8f8aac
-      #   hi LspHint guibg=#191919 guifg=#8aabac
-      # '';
     };
   };
 }