From acb4607a04d3ca0621378a05b6ab89e07a79c480 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Thu, 22 Apr 2021 01:23:00 +0200
Subject: [PATCH] home: theme: switch to real solarized for i3

---
 home/themes/solarizedLight/colors.nix | 13 ------
 home/themes/solarizedLight/i3.nix     | 58 +++++++++++++--------------
 2 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/home/themes/solarizedLight/colors.nix b/home/themes/solarizedLight/colors.nix
index e5cac20..f4c69b7 100644
--- a/home/themes/solarizedLight/colors.nix
+++ b/home/themes/solarizedLight/colors.nix
@@ -1,17 +1,4 @@
 {
-  i3 = {
-    background = "#282828";
-    red = "#cc241d";
-    green = "#98971a";
-    yellow = "#d79921";
-    blue = "#458588";
-    purple = "#b16286";
-    aqua = "#689d68";
-    gray = "#a89984";
-    darkGray = "#1d2021";
-    white = "#ffffff";
-  };
-
   base03  = "#002b36"; # brblack
   base02  = "#073642"; # black
   base01  = "#586e75"; # brgreen
diff --git a/home/themes/solarizedLight/i3.nix b/home/themes/solarizedLight/i3.nix
index 69a9982..3eab85d 100644
--- a/home/themes/solarizedLight/i3.nix
+++ b/home/themes/solarizedLight/i3.nix
@@ -1,64 +1,64 @@
 let
   colors = import ./colors.nix;
 in
-with colors.i3;
+with colors;
 {
   bar = {
-    background = background;
+    background = base3;
     statusline = yellow;
     separator = red;
 
     focusedWorkspace = {
-      border = aqua;
-      background = aqua;
-      text = darkGray;
+      border = blue;
+      background = blue;
+      text = base3; # base2 ?
     };
     inactiveWorkspace = {
-      border = darkGray;
-      background = darkGray;
-      text = yellow;
+      border = base2;
+      background = base2;
+      text = base00;
     };
     activeWorkspace = {
-      border = aqua;
-      background = darkGray;
+      border = blue;
+      background = base2;
       text = yellow;
     };
     urgentWorkspace = {
       border = red;
       background = red;
-      text = background;
+      text = base3;
     };
   };
 
   focused = {
     border = blue;
     background = blue;
-    text = darkGray;
-    indicator = purple;
-    childBorder = darkGray;
+    text = base3;
+    indicator = magenta;
+    childBorder = blue;
   };
 
   focusedInactive = {
-    border = darkGray;
-    background = darkGray;
-    text = yellow;
-    indicator = purple;
-    childBorder = darkGray;
+    border = base2;
+    background = base2;
+    text = base00;
+    indicator = magenta;
+    childBorder = base2;
   };
 
   unfocused = {
-    border = darkGray;
-    background = darkGray;
-    text = yellow;
-    indicator = purple;
-    childBorder = darkGray;
+    border = base2;
+    background = base2;
+    text = base00;
+    indicator = magenta;
+    childBorder = base2;
   };
 
   urgent = {
-    border = red;
-    background = red;
-    text = white;
-    indicator = red;
-    childBorder = red;
+    border = orange;
+    background = orange;
+    text = base3;
+    indicator = magenta;
+    childBorder = orange;
   };
 }