make more nixy

README.md

@@ -17,3 +17,6 @@ Shell: [fish](https://fishshell.com/) with the [pure](https://github.com/pure-fi
 WM: [niri](https://github.com/YaLTeR/niri) (KDE on my desktop)
 
 There is more that I'm using, but those are the main ones! Read my configs to get more into the specifics.
+
+### Background
+  - Got my background from (here)[https://old.reddit.com/r/celestegame/comments/11dtgwg/all_most_of_the_backgrounds_in_celeste_edited/] and used the command `magick input.png -filter Point -resize 2880x1920! output.png` to upscale it bilinearly

home-manager/flake.lock

@@ -54,11 +54,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738753876,
-        "narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=",
+        "lastModified": 1738789832,
+        "narHash": "sha256-HdlMPfObPu5y7oDfH/w3vvlU3UTQ/bQjSULChZARm5M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599",
+        "rev": "30ea6fed4e4b41693cebc2263373dd810de4de49",
         "type": "github"
       },
       "original": {

home-manager/progs/eww/config/scripts/sound/getVolume.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-count=$(wpctl get-volume @DEFAULT_SINK@ | sed 's/Volume: //g' | sed 's/0\.[0]//g')
+count=$(wpctl get-volume @DEFAULT_SINK@ | sed 's/Volume: //g' | sed -E 's/0\.0?//g')
 color="green"
 if ((count > 75)); then color="yellow"; fi
 if ((count > 90)); then color="peach"; fi

home-manager/progs/eww/config/statusbar.yuck

@@ -37,7 +37,7 @@
 
 (defwidget window-title []
   (label
-  :text "(${windowtitle})"))
+  :text "${windowtitle == "" ? "" : "(${windowtitle})"}"))
 
 (defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`)
 (defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`)
@@ -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`)
 

home-manager/progs/swaylock.nix

@@ -1,37 +1,50 @@
 { pkgs, ... }:
+let
+  blur = pkgs.callPackage ../util/blur.nix;
+in
 {
   programs.swaylock = {
     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 (blur {
+        src = ../wallpaper.png;
+      });
     };
   };
 }

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

home-manager/util/blur.nix

@@ -0,0 +1,25 @@
+{
+  stdenv,
+  imagemagick,
+  src,
+}:
+stdenv.mkDerivation {
+  pname = "blur-image";
+  version = "1.0";
+
+  inherit src;
+
+  buildInputs = [ imagemagick ];
+
+  # input is a file, not a directory, skip unpackPhase
+  unpackPhase = "true";
+
+  # command taken from: https://old.reddit.com/r/swaywm/comments/oz3t7v/setting_a_blurred_background_with_swaylock_and/
+  buildPhase = ''
+    magick ${src} -filter Gaussian -resize 20% -blur 0x2.5 -resize 500% output.png
+  '';
+
+  installPhase = ''
+    mv output.png $out
+  '';
+}