From 69297e60af96e9c37056d03f8fc988589f5f93c9 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Wed, 5 Feb 2025 19:30:40 -0500
Subject: [PATCH] make more nixy

---
 home-manager/progs/eww/config/statusbar.yuck |  3 --
 home-manager/progs/swaylock.nix              | 36 ++++++++++++--------
 home-manager/system-mreow.nix                |  2 --
 home-manager/util/blur.nix                   |  3 +-
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck
index 435a8a4..ffa7985 100644
--- a/home-manager/progs/eww/config/statusbar.yuck
+++ b/home-manager/progs/eww/config/statusbar.yuck
@@ -126,9 +126,6 @@
     (label :text "${EWW_BATTERY.BAT1.capacity}%" :class "yellow")))
 
 
-
-
-
 (defpoll volumevalue :interval "1s" `scripts/sound/getVolume.sh`)
 (defpoll volumesink :interval "1s" `scripts/sound/getSink.sh`)
 
diff --git a/home-manager/progs/swaylock.nix b/home-manager/progs/swaylock.nix
index c3fe2c8..d9d11fa 100644
--- a/home-manager/progs/swaylock.nix
+++ b/home-manager/progs/swaylock.nix
@@ -7,36 +7,44 @@ in
     enable = true;
     settings = {
       color = "24273a";
+      ring-color = "b7bdf8";
+
       bs-hl-color = "f4dbd6";
       caps-lock-bs-hl-color = "f4dbd6";
+      text-clear-color = "f4dbd6";
+      ring-clear-color = "f4dbd6";
+
+      text-caps-lock-color = "f5a97f";
+      ring-caps-lock-color = "f5a97f";
+
+      ring-ver-color = "8aadf4";
+      text-ver-color = "8aadf4";
+
+      ring-wrong-color = "ee99a0";
+      text-wrong-color = "ee99a0";
+
+      layout-text-color = "cad3f5";
+      text-color = "cad3f5";
+
       caps-lock-key-hl-color = "a6da95";
+      key-hl-color = "a6da95";
+
       inside-color = 0;
       inside-clear-color = 0;
       inside-caps-lock-color = 0;
       inside-ver-color = 0;
       inside-wrong-color = 0;
-      key-hl-color = "a6da95";
       layout-bg-color = 0;
       layout-border-color = 0;
-      layout-text-color = "cad3f5";
       line-color = 0;
       line-clear-color = 0;
       line-caps-lock-color = 0;
       line-ver-color = 0;
       line-wrong-color = 0;
-      ring-color = "b7bdf8";
-      ring-clear-color = "f4dbd6";
-      ring-caps-lock-color = "f5a97f";
-      ring-ver-color = "8aadf4";
-      ring-wrong-color = "ee99a0";
       separator-color = 0;
-      text-color = "cad3f5";
-      text-clear-color = "f4dbd6";
-      text-caps-lock-color = "f5a97f";
-      text-ver-color = "8aadf4";
-      text-wrong-color = "ee99a0";
-      # image = builtins.toString ../wallpaper_blurred.png;
-      image = "${(blur { src = ../wallpaper.png; })}/output.png";
+      image = builtins.toString (blur {
+        src = ../wallpaper.png;
+      });
     };
   };
 }
diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix
index bcf838a..a7354c7 100644
--- a/home-manager/system-mreow.nix
+++ b/home-manager/system-mreow.nix
@@ -26,8 +26,6 @@
 
     # used by /etc/nixos logic to launch niri
     config.programs.niri.package
-
-    xwayland-satellite-unstable
   ];
 
   # media controls
diff --git a/home-manager/util/blur.nix b/home-manager/util/blur.nix
index 67248af..79917d6 100644
--- a/home-manager/util/blur.nix
+++ b/home-manager/util/blur.nix
@@ -20,7 +20,6 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    mkdir -p $out
-    mv output.png $out/
+    mv output.png $out
   '';
 }