fix(i3blocks): use base16-shell for i3blocks

9 files changed, 42 insertions, 47 deletions

diff --git a/i3blocks/.config/i3blocks/config b/i3blocks/.config/i3blocks/config
index 780e675..bacc264 100644
--- a/i3blocks/.config/i3blocks/config
+++ b/i3blocks/.config/i3blocks/config
@@ -1,10 +1,5 @@
 markup=pango
 interval=5
-black="#1d2021"
-white="#d5c4a1"
-green="#8ec07c"
-yellow="#fabd2f"
-red="#fb4934"
 
 [i3blocks-title]
 command=$SCRIPT_DIR/i3blocks-title
diff --git a/i3blocks/.local/lib/i3blocks/i3blocks-cpu b/i3blocks/.local/lib/i3blocks/i3blocks-cpu
index 3ad1f28..29bb914 100755
--- a/i3blocks/.local/lib/i3blocks/i3blocks-cpu
+++ b/i3blocks/.local/lib/i3blocks/i3blocks-cpu
@@ -12,14 +12,14 @@ def main():
 
     print(f" {ICON} {load}% \n")
     if load > 90:
-        print(os.environ.get("black", ""))
-        print(os.environ.get("red", ""))
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_08_HEX")}")
     elif load > 60:
-        print(os.environ.get("black", ""))
-        print(os.environ.get("yellow", ""))
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_0A_HEX")}")
     elif load > 30:
-        print(os.environ.get("black", ""))
-        print(os.environ.get("green", ""))
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_0C_HEX")}")
 
 
 if __name__ == "__main__":
diff --git a/i3blocks/.local/lib/i3blocks/i3blocks-disk b/i3blocks/.local/lib/i3blocks/i3blocks-disk
index 2971a49..a98a40c 100755
--- a/i3blocks/.local/lib/i3blocks/i3blocks-disk
+++ b/i3blocks/.local/lib/i3blocks/i3blocks-disk
@@ -17,11 +17,11 @@ def main():
 
     print(f" {ICON} {round(avail)}{unit} \n")
     if bytes < (20 * GB):
-        print(os.environ.get("black", ""))
-        print(os.environ.get("red", ""))
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_08_HEX")}")
     elif bytes < (10 * GB):
-        print(os.environ.get("black", ""))
-        print(os.environ.get("yellow", ""))
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_0A_HEX")}")
 
 
 if __name__ == "__main__":
diff --git a/i3blocks/.local/lib/i3blocks/i3blocks-dunst b/i3blocks/.local/lib/i3blocks/i3blocks-dunst
index 73a8fc2..46e7f5f 100755
--- a/i3blocks/.local/lib/i3blocks/i3blocks-dunst
+++ b/i3blocks/.local/lib/i3blocks/i3blocks-dunst
@@ -45,11 +45,11 @@ class Dunst:
         output = {"full_text": f" {icon}{count} "}
 
         if self.displayed + self.waiting > 0:
-            output["color"] = os.environ.get("black")
-            output["background"] = os.environ.get("green")
+            output["color"] = f"#{os.environ.get("BASE16_COLOR_00_HEX")}"
+            output["background"] = f"#{os.environ.get("BASE16_COLOR_0C_HEX")}"
         elif self.paused:
-            output["color"] = os.environ.get("black")
-            output["background"] = os.environ.get("yellow")
+            output["color"] = f"#{os.environ.get("BASE16_COLOR_00_HEX")}"
+            output["background"] = f"#{os.environ.get("BASE16_COLOR_0A_HEX")}"
 
         print(json.dumps(output, ensure_ascii=False), flush=True)
 
diff --git a/i3blocks/.local/lib/i3blocks/i3blocks-gpu b/i3blocks/.local/lib/i3blocks/i3blocks-gpu
index bf1a31d..df96d6c 100755
--- a/i3blocks/.local/lib/i3blocks/i3blocks-gpu
+++ b/i3blocks/.local/lib/i3blocks/i3blocks-gpu
@@ -12,18 +12,18 @@ def main():
         return
 
     with open(files[0]) as f:
-        usage = int(f.readline())
-
-    print(f" {ICON} {usage}% \n")
-    if usage > 90:
-        print(os.environ.get("black", ""))
-        print(os.environ.get("red", ""))
-    elif usage > 60:
-        print(os.environ.get("black", ""))
-        print(os.environ.get("yellow", ""))
-    elif usage > 30:
-        print(os.environ.get("black", ""))
-        print(os.environ.get("green", ""))
+        load = int(f.readline())
+
+    print(f" {ICON} {load}% \n")
+    if load > 90:
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_08_HEX")}")
+    elif load > 60:
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_0A_HEX")}")
+    elif load > 30:
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_0C_HEX")}")
 
 
 if __name__ == "__main__":
diff --git a/i3blocks/.local/lib/i3blocks/i3blocks-memory b/i3blocks/.local/lib/i3blocks/i3blocks-memory
index ff0d7ae..b0dad06 100755
--- a/i3blocks/.local/lib/i3blocks/i3blocks-memory
+++ b/i3blocks/.local/lib/i3blocks/i3blocks-memory
@@ -19,11 +19,11 @@ def main():
 
     print(f" {ICON} {used}% \n")
     if used > 95:
-        print(os.environ.get("black", ""))
-        print(os.environ.get("red", ""))
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_08_HEX")}")
     elif used > 80:
-        print(os.environ.get("black", ""))
-        print(os.environ.get("yellow", ""))
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_0A_HEX")}")
 
 
 if __name__ == "__main__":
diff --git a/i3blocks/.local/lib/i3blocks/i3blocks-miniflux b/i3blocks/.local/lib/i3blocks/i3blocks-miniflux
index f9950ba..d8c973b 100755
--- a/i3blocks/.local/lib/i3blocks/i3blocks-miniflux
+++ b/i3blocks/.local/lib/i3blocks/i3blocks-miniflux
@@ -14,12 +14,12 @@ def main():
     count = sum(resp.json().get("unreads").values())
 
     print(f" {ICON} {count} \n")
-    if count > 50:
-        print(os.environ.get("black"))
-        print(os.environ.get("red"))
+    if count > 10:
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_08_HEX")}")
     elif count > 0:
-        print(os.environ.get("black"))
-        print(os.environ.get("yellow"))
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_0A_HEX")}")
 
 
 if __name__ == "__main__":
diff --git a/i3blocks/.local/lib/i3blocks/i3blocks-notmuch b/i3blocks/.local/lib/i3blocks/i3blocks-notmuch
index b25c971..a81fae6 100755
--- a/i3blocks/.local/lib/i3blocks/i3blocks-notmuch
+++ b/i3blocks/.local/lib/i3blocks/i3blocks-notmuch
@@ -21,12 +21,12 @@ def main():
     count = notmuch.Database().create_query("tag:unread").count_messages()
 
     print(f" {ICON} {count} \n")
-    if count > 50:
-        print(os.environ.get("black"))
-        print(os.environ.get("red"))
+    if count > 10:
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_08_HEX")}")
     elif count > 0:
-        print(os.environ.get("black"))
-        print(os.environ.get("yellow"))
+        print(f"#{os.environ.get("BASE16_COLOR_00_HEX")}")
+        print(f"#{os.environ.get("BASE16_COLOR_0A_HEX")}")
 
 
 if __name__ == "__main__":
diff --git a/i3blocks/.local/lib/i3blocks/i3blocks-volume b/i3blocks/.local/lib/i3blocks/i3blocks-volume
index d3998fd..c9d6e54 100755
--- a/i3blocks/.local/lib/i3blocks/i3blocks-volume
+++ b/i3blocks/.local/lib/i3blocks/i3blocks-volume
@@ -66,8 +66,8 @@ class PulseAudio:
         output = {"full_text": f" {self.icon} {self.volume}% "}
 
         if self.sink.get("mute"):
-            output["color"] = os.environ.get("black")
-            output["background"] = os.environ.get("yellow")
+            output["color"] = f"#{os.environ.get("BASE16_COLOR_00_HEX")}"
+            output["background"] = f"#{os.environ.get("BASE16_COLOR_0A_HEX")}"
 
         match format:
             case "json":