From c1b4791f3bc1057e866c05690dc3005eb2bec59f Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Mon, 29 Jul 2024 15:35:31 +0200
Subject: [PATCH] swaylock layout config and a bit cleaner

---
 modules/niri/swaylock.conf.nix | 63 +++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/modules/niri/swaylock.conf.nix b/modules/niri/swaylock.conf.nix
index f3dbe8a..a6e1392 100644
--- a/modules/niri/swaylock.conf.nix
+++ b/modules/niri/swaylock.conf.nix
@@ -1,32 +1,47 @@
-{ lib, config, ... }: {
+{ lib, config, ... }: let
+  inherit (lib.strings) concatStrings;
+  inherit (config) theme;
+in {
   ignore-empty-password = true;
-  screenshots = true;
-  clock = true;
   submit-on-touch = true;
+
+  effect-blur = "30x10";
+  screenshots = true;
+
+  clock = true;
+
   indicator = true;
   indicator-caps-lock = true;
   indicator-radius = 100;
   indicator-thickness = 4;
-  inside-color = lib.strings.concatStrings [ config.theme.overlay "aa" ];
-  inside-clear-color = lib.strings.concatStrings [ config.theme.subtle "aa" ];
-  inside-caps-lock-color = lib.strings.concatStrings [ config.theme.rose "aa" ];
-  inside-ver-color = lib.strings.concatStrings [ config.theme.foam "aa" ];
-  inside-wrong-color = lib.strings.concatStrings [ config.theme.love "aa" ];
+
+  inside-color = concatStrings [ theme.overlay "aa" ];
+  inside-clear-color = concatStrings [ theme.subtle "aa" ];
+  inside-caps-lock-color = concatStrings [ theme.rose "aa" ];
+  inside-ver-color = concatStrings [ theme.foam "aa" ];
+  inside-wrong-color = concatStrings [ theme.love "aa" ];
   line-uses-inside = true;
-  ring-color = config.theme.surface;
-  ring-clear-color = config.theme.muted;
-  ring-caps-lock-color = config.theme.gold;
-  ring-ver-color = config.theme.pine;
-  ring-wrong-color = config.theme.love;
-  separator-color = config.theme.base;
-  key-hl-color = config.theme.iris;
-  bs-hl-color = config.theme.love;
-  caps-lock-key-hl-color = config.theme.iris;
-  caps-lock-bs-hl-color = config.theme.love;
-  text-color = config.theme.text;
-  text-clear-color = config.theme.text;
-  text-caps-lock-color = config.theme.text;
-  text-ver-color = config.theme.text;
-  text-wrong-color = config.theme.text;
-  effect-blur = "30x10";
+
+  ring-color = theme.surface;
+  ring-clear-color = theme.muted;
+  ring-caps-lock-color = theme.gold;
+  ring-ver-color = theme.pine;
+  ring-wrong-color = theme.love;
+
+  separator-color = theme.base;
+
+  key-hl-color = theme.iris;
+  bs-hl-color = theme.love;
+  caps-lock-key-hl-color = theme.iris;
+  caps-lock-bs-hl-color = theme.love;
+
+  layout-bg-color = concatStrings [ theme.overlay "aa" ];
+  layout-border-color = concatStrings [ theme.overlay "aa" ];
+  layout-text-color = theme.text;
+
+  text-color = theme.text;
+  text-clear-color = theme.text;
+  text-caps-lock-color = theme.text;
+  text-ver-color = theme.text;
+  text-wrong-color = theme.text;
 }