From 8c72e2ed3ab9fe49947a0f8c4f75bd3ba957e34f Mon Sep 17 00:00:00 2001
From: Jakob Lechner <mail@jalr.de>
Date: Fri, 24 Oct 2025 23:00:06 +0200
Subject: [PATCH] fixup! Rework solarized

---
 users/jalr/modules/mycli/default.nix | 68 +++++++++++++++-------------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/users/jalr/modules/mycli/default.nix b/users/jalr/modules/mycli/default.nix
index e023039..844102b 100644
--- a/users/jalr/modules/mycli/default.nix
+++ b/users/jalr/modules/mycli/default.nix
@@ -105,39 +105,43 @@ let
     };
   };
 
-  colors = {
-    common = {
-      "output.header" = "bold ${solarized.green.hex}";
-      "sql.datatype" = "nobold ${solarized.yellow.hex}";
-      "sql.function" = "bold ${solarized.violet.hex}";
-      "sql.keyword" = solarized.green.hex;
-      "sql.literal" = solarized.green.hex;
-      "sql.number" = solarized.cyan.hex;
-      "sql.string" = solarized.cyan.hex;
-      "sql.variable" = solarized.red.hex;
-      "sql.quoted-schema-object" = solarized.blue.hex;
+  colors =
+    let
+      c = solarized.colors;
+    in
+    {
+      common = {
+        "output.header" = "bold ${c.green}";
+        "sql.datatype" = "nobold ${c.yellow}";
+        "sql.function" = "bold ${c.violet}";
+        "sql.keyword" = c.green;
+        "sql.literal" = c.green;
+        "sql.number" = c.cyan;
+        "sql.string" = c.cyan;
+        "sql.variable" = c.red;
+        "sql.quoted-schema-object" = c.blue;
+      };
+      light = {
+        "prompt" = "bg:${c.blue} ${c.base02}";
+        "selected" = "bg:${c.base2} ${c.base00}";
+        "output.odd-row" = "${c.base01}";
+        "output.even-row" = "${c.base01} bg:${c.base2}";
+        "sql.comment" = "italic ${c.base1}";
+        "sql.operator" = "bold ${c.base02}";
+        "sql.punctuation" = "bold ${c.base01}";
+        "sql.symbol" = "${c.base01}";
+      };
+      dark = {
+        "prompt" = "bg:${c.blue} ${c.base2}";
+        "selected" = "bg:${c.base02} ${c.base0}";
+        "output.odd-row" = "${c.base1}";
+        "output.even-row" = "${c.base1} bg:${c.base02}";
+        "sql.comment" = "italic ${c.base01}";
+        "sql.operator" = "bold ${c.base2}";
+        "sql.punctuation" = "bold ${c.base1}";
+        "sql.symbol" = "${c.base1}";
+      };
     };
-    light = {
-      "prompt" = "bg:${solarized.blue.hex} ${solarized.base02.hex}";
-      "selected" = "bg:${solarized.base2.hex} ${solarized.base00.hex}";
-      "output.odd-row" = "${solarized.base01.hex}";
-      "output.even-row" = "${solarized.base01.hex} bg:${solarized.base2.hex}";
-      "sql.comment" = "italic ${solarized.base1.hex}";
-      "sql.operator" = "bold ${solarized.base02.hex}";
-      "sql.punctuation" = "bold ${solarized.base01.hex}";
-      "sql.symbol" = "${solarized.base01.hex}";
-    };
-    dark = {
-      "prompt" = "bg:${solarized.blue.hex} ${solarized.base2.hex}";
-      "selected" = "bg:${solarized.base02.hex} ${solarized.base0.hex}";
-      "output.odd-row" = "${solarized.base1.hex}";
-      "output.even-row" = "${solarized.base1.hex} bg:${solarized.base02.hex}";
-      "sql.comment" = "italic ${solarized.base01.hex}";
-      "sql.operator" = "bold ${solarized.base2.hex}";
-      "sql.punctuation" = "bold ${solarized.base1.hex}";
-      "sql.symbol" = "${solarized.base1.hex}";
-    };
-  };
 in
 {
   home.packages = [