From 97f500a3bf8f2a3dadd12e719ad01b505222b4af Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Mon, 21 Oct 2024 16:01:25 +0200
Subject: [PATCH] fixup! Custom packages

---
 pkgs/wl-lockscreen/default.nix | 39 ++++++++++++++++------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/pkgs/wl-lockscreen/default.nix b/pkgs/wl-lockscreen/default.nix
index 7d3bc18..24b029f 100644
--- a/pkgs/wl-lockscreen/default.nix
+++ b/pkgs/wl-lockscreen/default.nix
@@ -1,32 +1,29 @@
 { roboto
 , swaylock
 , writeScriptBin
-, font ? { package = roboto; name = "Roboto"; size = 10; }
-, colors ? {
-    base = "000000ff";
-    inside = { ver = "00ff00ff"; wrong = "ff0000ff"; base = "000000ff"; };
-    ring = { ver = "10ff10ff"; wrong = "ff1010ff"; base = "1010ffff"; };
-    key.hl = "ff1010ff";
-    bs.hl = "ff1010ff";
-    separator = "000000ff";
-  }
 , wallpaper ? ../../wallpapers/n8ca4obsys991.png
+, font ? { package = roboto; name = "Roboto"; size = 10; }
+, strPalette ? {
+    primary.background = "000000ff";
+    normal = { red = "ff0000ff"; green = "00ff00ff"; black = "000000ff"; };
+    bright = { red = "ff1010ff"; green = "10ff10ff"; blue = "1010ffff"; };
+  }
 }: writeScriptBin "wl-lockscreen" ''
   # Using font package ${font.package}
   ${swaylock}/bin/swaylock \
-  --color "${colors.base}" \
-  --inside-ver-color "${colors.inside.ver}" \
-  --inside-wrong-color "${colors.inside.wrong}" \
-  --inside-color "${colors.inside.base}" \
-  --ring-ver-color "${colors.ring.ver}" \
-  --ring-wrong-color "${colors.ring.wrong}" \
-  --ring-ver-color "${colors.ring.ver}" \
-  --ring-wrong-color "${colors.ring.wrong}" \
-  --ring-color "${colors.ring.base}" \
+  --color "${strPalette.primary.background}" \
+  --inside-ver-color "${strPalette.normal.green}" \
+  --inside-wrong-color "${strPalette.normal.red}" \
+  --inside-color "${strPalette.normal.black}" \
+  --ring-ver-color "${strPalette.bright.green}" \
+  --ring-wrong-color "${strPalette.bright.red}" \
+  --ring-ver-color "${strPalette.bright.green}" \
+  --ring-wrong-color "${strPalette.bright.red}" \
+  --ring-color "${strPalette.bright.blue}" \
   --line-uses-ring \
-  --key-hl-color "${colors.key.hl}" \
-  --bs-hl-color "${colors.bs.hl}" \
-  --separator-color "${colors.separator}" \
+  --key-hl-color "${strPalette.bright.red}" \
+  --bs-hl-color "${strPalette.bright.red}" \
+  --separator-color "${strPalette.normal.black}" \
   --font "${font.name}" \
   --font-size "${toString font.size}" \
   --image "${toString wallpaper}" \