move chpaper script into package

home/default.nix

@@ -22,7 +22,6 @@ in
       ./gtk.nix
       ./misc.nix
       ./persistence.nix
-      ./scripts.nix
       ./wm
       ./programs
       ./services

home/scripts.nix

@@ -1,27 +0,0 @@
-{ osConfig, pkgs, ... }:
-{
-  xdg.configFile = {
-    "scripts/chpaper.sh" = {
-      text = ''
-        #!/bin/sh
-
-        set -eu
-
-        DIR="''${HOME}/.local/share/wallpapers"
-
-        random_paper() {
-          find -L "''${DIR}"/ -type f -regextype egrep -regex ".*\.(jpe?g|png)$" | shuf -n1
-        }
-
-        SWAYSOCK="''${SWAYSOCK:-""}"
-        if [ -z "''${SWAYSOCK}" ] ; then
-          SWAYSOCK="$(find /run/user/"$(id -u)"/ -name "sway-ipc.$(id -u).*.sock")"
-          export SWAYSOCK
-        fi
-        ${pkgs.imagemagick}/bin/convert "$(random_paper)" /tmp/wallpaper.jpg && swaymsg "output * bg '/tmp/wallpaper.jpg' fill" &
-        ${pkgs.imagemagick}/bin/convert "$(random_paper)" /tmp/lockpaper.jpg
-      '';
-      executable = true;
-    };
-  };
-}

packages/scripts/chpaper.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -eu
+
+DIR="$1"
+if [ ! -d "$DIR" ]; then
+  echo "$DIR: not a directory"
+  exit 1
+fi
+
+random_paper() {
+  find -L "${DIR}"/ -type f -regextype egrep -regex ".*\.(jpe?g|png)$" | shuf -n1
+}
+
+convert "$(random_paper)" /tmp/wallpaper.jpg && swaybg -i "/tmp/wallpaper.jpg" -m fill &
+convert "$(random_paper)" /tmp/lockpaper.jpg

packages/scripts/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, makeWrapper, libnotify, rofi-wayland, tmux, kitty }:
+{ lib, stdenvNoCC, makeWrapper, libnotify, rofi-wayland, tmux, kitty, iagemagick, swaybg }:
 
 stdenvNoCC.mkDerivation {
   pname = "scripts";
@@ -17,5 +17,9 @@ stdenvNoCC.mkDerivation {
     cp tmux-sessions.sh $out/bin/tmux-sessions
     chmod +x $out/bin/tmux-sessions
     wrapProgram $out/bin/tmux-sessions --prefix PATH : ${lib.makeBinPath [ tmux kitty rofi-wayland ]}
+
+    cp chpaper.sh $out/bin/chpaper
+    chmod +x $out/bin/chpaper
+    wrapProgram $out/bin/chpaper --prefix PATH : ${lib.makeBinPath [ imagemagick swaybg ]}
   '';
 }