From 7acf0e13f3047217801e43336de2fe76af807da5 Mon Sep 17 00:00:00 2001
From: dakedres <ramondolive@gmail.com>
Date: Mon, 29 Jan 2024 19:56:18 -0700
Subject: [PATCH] New color system

---
 colors/monokai-dark/default.nix            | 20 -------
 host/home.nix                              |  4 +-
 modules/ncspot/colors.nix                  | 66 +++++++++++-----------
 test.fish                                  |  2 -
 themes/colors/base16-3024.nix              | 18 ++++++
 themes/colors/base16-apathy.nix            | 18 ++++++
 themes/colors/base16-monokai.nix           | 18 ++++++
 themes/colors/base16-seti.nix              | 18 ++++++
 themes/colors/base16-still-alive.nix       | 18 ++++++
 themes/colors/base16-windows-95.nix        | 18 ++++++
 themes/colors/base16-zenbones.nix          | 18 ++++++
 {colors => themes}/kaolin-dark/default.nix |  0
 12 files changed, 162 insertions(+), 56 deletions(-)
 delete mode 100644 colors/monokai-dark/default.nix
 delete mode 100755 test.fish
 create mode 100644 themes/colors/base16-3024.nix
 create mode 100644 themes/colors/base16-apathy.nix
 create mode 100644 themes/colors/base16-monokai.nix
 create mode 100644 themes/colors/base16-seti.nix
 create mode 100644 themes/colors/base16-still-alive.nix
 create mode 100644 themes/colors/base16-windows-95.nix
 create mode 100644 themes/colors/base16-zenbones.nix
 rename {colors => themes}/kaolin-dark/default.nix (100%)

diff --git a/colors/monokai-dark/default.nix b/colors/monokai-dark/default.nix
deleted file mode 100644
index 06595fa..0000000
--- a/colors/monokai-dark/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ ... }: {
-  custom.colors = {
-    base00 = "#272822";
-    base01 = "#383830";
-    base02 = "#49483e";
-    base03 = "#75715e";
-    base04 = "#a59f85";
-    base05 = "#f8f8f2";
-    base06 = "#f5f4f1";
-    base07 = "#f9f8f5";
-    base08 = "#f92672";
-    base09 = "#fd971f";
-    base0A = "#f4bf75";
-    base0B = "#a6e22e";
-    base0C = "#a1efe4";
-    base0D = "#66d9ef";
-    base0E = "#ae81ff";
-    base0F = "#cc6633";
-  };
-}
diff --git a/host/home.nix b/host/home.nix
index f218d42..599cbe1 100644
--- a/host/home.nix
+++ b/host/home.nix
@@ -13,6 +13,8 @@ packages = [
   # Visual
   pkgs.imagemagick
   pkgs.kate
+  pkgs.helix
+  pkgs.howl
 
     #Games
     pkgs.prismlauncher-qt5
@@ -28,7 +30,7 @@ nonFreePackages = [
 ];
 
 in {
-  imports = [ ../colors/monokai-dark ];
+  custom.colors = import ../themes/colors/base16-monokai.nix;
   custom.wallpaper = ../wallpapers/blip-blip-blip-blip.jpg;
 
   home = {
diff --git a/modules/ncspot/colors.nix b/modules/ncspot/colors.nix
index 17d866c..80ff741 100644
--- a/modules/ncspot/colors.nix
+++ b/modules/ncspot/colors.nix
@@ -12,40 +12,40 @@
     programs.ncspot.settings.theme = with config.custom.colors; {
       # Attempts to look kinda green like the official client
 
-      background = base00;
-      primary = base04;
-      secondary = base01;
-      title = base0B; # green
-      playing = base0B; # green
-      playing_selected = base0C; # cyan
-      playing_bg = base06;
-      highlight = base04;
-      highlight_bg = base02;
-      error = base04;
-      error_bg = base08;
-      statusbar = base00;
-      statusbar_progress = base0B;
-      statusbar_bg = base0B;
-      cmdline = base04;
-      search_match = base0A;
+      # background = base00;
+      # primary = base04;
+      # secondary = base01;
+      # title = base0B; # green
+      # playing = base0B; # green
+      # playing_selected = base0C; # cyan
+      # playing_bg = base06;
+      # highlight = base04;
+      # highlight_bg = base02;
+      # error = base04;
+      # error_bg = base08;
+      # statusbar = base00;
+      # statusbar_progress = base0B;
+      # statusbar_bg = base0B;
+      # cmdline = base04;
+      # search_match = base0A;
 
-#       background = "black"
-#       primary = "light white"
-#       secondary = "light black"
-#       title = "green"
-#       playing = "green"
-#       playing_selected = "light green"
-#       playing_bg = "black"
-#       highlight = "light white"
-#       highlight_bg = "#484848"
-#       error = "light white"
-#       error_bg = "red"
-#       statusbar = "black"
-#       statusbar_progress = "green"
-#       statusbar_bg = "green"
-#       cmdline = "light white"
-#       cmdline_bg = "black"
-#       search_match = "light red"
+      background = "black";
+      primary = "light white";
+      secondary = "light black";
+      title = "green";
+      playing = "green";
+      playing_selected = "light green";
+      playing_bg = "black";
+      highlight = "light white";
+      highlight_bg = "#484848";
+      error = "light white";
+      error_bg = "red";
+      statusbar = "black";
+      statusbar_progress = "green";
+      statusbar_bg = "green";
+      cmdline = "light white";
+      cmdline_bg = "black";
+      search_match = "light red";
     };
   };
 }
diff --git a/test.fish b/test.fish
deleted file mode 100755
index f7483e5..0000000
--- a/test.fish
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /etc/fish
-
diff --git a/themes/colors/base16-3024.nix b/themes/colors/base16-3024.nix
new file mode 100644
index 0000000..0a6a15b
--- /dev/null
+++ b/themes/colors/base16-3024.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#090300";
+  base01 = "#3a3432";
+  base02 = "#4a4543";
+  base03 = "#5c5855";
+  base04 = "#807d7c";
+  base05 = "#a5a2a2";
+  base06 = "#d6d5d4";
+  base07 = "#f7f7f7";
+  base08 = "#db2d20";
+  base09 = "#e8bbd0";
+  base0A = "#fded02";
+  base0B = "#01a252";
+  base0C = "#b5e4f4";
+  base0D = "#01a0e4";
+  base0E = "#a16a94";
+  base0F = "#cdab53";
+}
diff --git a/themes/colors/base16-apathy.nix b/themes/colors/base16-apathy.nix
new file mode 100644
index 0000000..5ba23f9
--- /dev/null
+++ b/themes/colors/base16-apathy.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#031a16";
+  base01 = "#0b342d";
+  base02 = "#184e45";
+  base03 = "#2b685e";
+  base04 = "#5f9c92";
+  base05 = "#81b5ac";
+  base06 = "#a7cec8";
+  base07 = "#d2e7e4";
+  base08 = "#3e9688";
+  base09 = "#3e7996";
+  base0A = "#3e4c96";
+  base0B = "#883e96";
+  base0C = "#963e4c";
+  base0D = "#96883e";
+  base0E = "#4c963e";
+  base0F = "#3e965b";
+}
diff --git a/themes/colors/base16-monokai.nix b/themes/colors/base16-monokai.nix
new file mode 100644
index 0000000..d7d4361
--- /dev/null
+++ b/themes/colors/base16-monokai.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#272822";
+  base01 = "#383830";
+  base02 = "#49483e";
+  base03 = "#75715e";
+  base04 = "#a59f85";
+  base05 = "#f8f8f2";
+  base06 = "#f5f4f1";
+  base07 = "#f9f8f5";
+  base08 = "#f92672";
+  base09 = "#fd971f";
+  base0A = "#f4bf75";
+  base0B = "#a6e22e";
+  base0C = "#a1efe4";
+  base0D = "#66d9ef";
+  base0E = "#ae81ff";
+  base0F = "#cc6633";
+}
diff --git a/themes/colors/base16-seti.nix b/themes/colors/base16-seti.nix
new file mode 100644
index 0000000..8c8b6e5
--- /dev/null
+++ b/themes/colors/base16-seti.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#151718";
+  base01 = "#282a2b";
+  base02 = "#3b758c";
+  base03 = "#41535b";
+  base04 = "#43a5d5";
+  base05 = "#d6d6d6";
+  base06 = "#eeeeee";
+  base07 = "#ffffff";
+  base08 = "#cd3f45";
+  base09 = "#db7b55";
+  base0A = "#e6cd69";
+  base0B = "#9fca56";
+  base0C = "#55dbbe";
+  base0D = "#55b5db";
+  base0E = "#a074c4";
+  base0F = "#8a553f";
+}
diff --git a/themes/colors/base16-still-alive.nix b/themes/colors/base16-still-alive.nix
new file mode 100644
index 0000000..cd4023b
--- /dev/null
+++ b/themes/colors/base16-still-alive.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#f0f0f0";
+  base01 = "#f0d848";
+  base02 = "#fff018";
+  base03 = "#f01818";
+  base04 = "#f00000";
+  base05 = "#d80000";
+  base06 = "#489000";
+  base07 = "#30a860";
+  base08 = "#487830";
+  base09 = "#183048";
+  base0A = "#426395";
+  base0B = "#5c5c6a";
+  base0C = "#2c3c57";
+  base0D = "#001878";
+  base0E = "#900000";
+  base0F = "#140c0d";
+}
diff --git a/themes/colors/base16-windows-95.nix b/themes/colors/base16-windows-95.nix
new file mode 100644
index 0000000..5548b5e
--- /dev/null
+++ b/themes/colors/base16-windows-95.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#000000";
+  base01 = "#1c1c1c";
+  base02 = "#383838";
+  base03 = "#545454";
+  base04 = "#7e7e7e";
+  base05 = "#a8a8a8";
+  base06 = "#d2d2d2";
+  base07 = "#fcfcfc";
+  base08 = "#fc5454";
+  base09 = "#a85400";
+  base0A = "#fcfc54";
+  base0B = "#54fc54";
+  base0C = "#54fcfc";
+  base0D = "#5454fc";
+  base0E = "#fc54fc";
+  base0F = "#00a800";
+}
diff --git a/themes/colors/base16-zenbones.nix b/themes/colors/base16-zenbones.nix
new file mode 100644
index 0000000..8af8074
--- /dev/null
+++ b/themes/colors/base16-zenbones.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#191919";
+  base01 = "#de6e7c";
+  base02 = "#819b69";
+  base03 = "#b77e64";
+  base04 = "#6099c0";
+  base05 = "#b279a7";
+  base06 = "#66a5ad";
+  base07 = "#bbbbbb";
+  base08 = "#3d3839";
+  base09 = "#e8838f";
+  base0A = "#8bae68";
+  base0B = "#d68c67";
+  base0C = "#61abda";
+  base0D = "#cf86c1";
+  base0E = "#65b8c1";
+  base0F = "#8e8e8e";
+}
diff --git a/colors/kaolin-dark/default.nix b/themes/kaolin-dark/default.nix
similarity index 100%
rename from colors/kaolin-dark/default.nix
rename to themes/kaolin-dark/default.nix