From 1d317b21fbbad0213270480a6404f79a7c372897 Mon Sep 17 00:00:00 2001
From: notgne2 <gen2@gen2.space>
Date: Wed, 2 Nov 2022 20:15:13 -0700
Subject: [PATCH] fix rgb themeing

---
 home-manager/modules/colors.nix | 16 ++--------------
 home-manager/users/notgne2.nix  | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/home-manager/modules/colors.nix b/home-manager/modules/colors.nix
index fa4e3fa..f848fd7 100644
--- a/home-manager/modules/colors.nix
+++ b/home-manager/modules/colors.nix
@@ -7,13 +7,6 @@ inputs: {
 with lib; let
   cfg = config.ezcolors;
 
-  pow = n: i:
-    if i == 1
-    then n
-    else if i == 0
-    then 1
-    else n * pow n (i - 1);
-
   alf = ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "a" "b" "c" "d" "e" "f"];
   fil = c:
     lib.imap0 (n: x:
@@ -22,12 +15,7 @@ with lib; let
       else null)
     alf;
   fin = c: builtins.elemAt (builtins.filter (x: x != null) (fil c)) 0;
-  add = l:
-    lib.foldr ({
-      n,
-      x,
-    }: c: (x * (pow 16 n)) + c)
-    0 (lib.imap0 (n: x: {inherit n x;}) l);
+  add = l: lib.foldl (acc: n: acc * 16 + n) 0 l;
   calc = s: add (builtins.map fin (builtins.filter (x: builtins.isString x && builtins.stringLength x == 1) (builtins.split "" s)));
 
   splitHex = c: let
@@ -324,7 +312,7 @@ in {
           * {
               background-color:      @background;
               border-color:          @border-color;
-              text-color:           @foreground;
+              text-color:            @foreground;
           }
 
           #window {
diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix
index 3518663..81abc09 100644
--- a/home-manager/users/notgne2.nix
+++ b/home-manager/users/notgne2.nix
@@ -226,22 +226,22 @@ in {
   };
 
   ezcolors.baseColors = {
-    base00 = "1e0528";
-    base01 = "1A092D";
-    base02 = "331354";
-    base03 = "320f55";
-    base04 = "873582";
-    base05 = "ffeeff";
-    base06 = "ffeeff";
-    base07 = "f8c0ff";
-    base08 = "00d9e9";
-    base09 = "aa00a3";
-    base0A = "955ae7";
-    base0B = "05cb0d";
-    base0C = "b900b1";
-    base0D = "550068";
-    base0E = "8991bb";
-    base0F = "4d6fff";
+    base00 = "22273b";
+    base01 = "414f60";
+    base02 = "5a8380";
+    base03 = "6e6f72";
+    base04 = "87888b";
+    base05 = "a4a6a9";
+    base06 = "c7c9cd";
+    base07 = "8dbdaa";
+    base08 = "777abc";
+    base09 = "94929e";
+    base0A = "4f9062";
+    base0B = "6562a8";
+    base0C = "226f68";
+    base0D = "4d6bb6";
+    base0E = "716cae";
+    base0F = "8c70a7";
   };
 
   home.sessionVariables = {