Fix(treewide): Update to new shell library version

48 files changed, 103 insertions, 139 deletions

diff --git a/bootstrap/activate/activate.sh b/bootstrap/activate/activate.sh
index f6176e59..d34a2826 100755
--- a/bootstrap/activate/activate.sh
+++ b/bootstrap/activate/activate.sh
@@ -1,8 +1,8 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
-export LIB_TEMP_DIR_FOR_SCRIPT="$(mktemp -d)"
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
+
 mne() {
     mount --mkdir --options compress-force=zstd:15,subvol="$1" $DISK_ROOT "$2" || dien "Mounting of $1";
 }
@@ -71,4 +71,5 @@ case $result in
         exit 1
         ;;
 esac
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
+
+# vim: ft=sh
diff --git a/bootstrap/activate/default.nix b/bootstrap/activate/default.nix
index c60d8e73..abada12c 100644
--- a/bootstrap/activate/default.nix
+++ b/bootstrap/activate/default.nix
@@ -6,6 +6,6 @@
 }: let
   dependencies = builtins.attrValues {inherit (pkgs) jq gawk curl coreutils libuuid nix git;};
   name = "activate";
-  script = ./activate.sh;
+  src = ./activate.sh;
 in
-  sysLib.makeShellScriptWithLibrary {inherit dependencies name script;}
+  sysLib.writeShellScriptWithLibrary {inherit dependencies name src;}
diff --git a/bootstrap/config_setup/config_setup.sh b/bootstrap/config_setup/config_setup.sh
index c856c517..15b41a8d 100755
--- a/bootstrap/config_setup/config_setup.sh
+++ b/bootstrap/config_setup/config_setup.sh
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
-export LIB_TEMP_DIR_FOR_SCRIPT="$(mktemp -d)"
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 
 # clone packer.nvim to the needed dir, for the nvim install to work
@@ -10,4 +9,4 @@ git clone --depth 1 https://github.com/wbthomason/packer.nvim /mnt/srv/home/sois
 
 nvim -c 'PackerSync' -c 'qall' -u '/mnt/srv/home/soispha/.config/nvim/init.lua' --headless
 
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
+# vim: ft=sh
diff --git a/bootstrap/config_setup/default.nix b/bootstrap/config_setup/default.nix
index 20de9542..4cae8424 100644
--- a/bootstrap/config_setup/default.nix
+++ b/bootstrap/config_setup/default.nix
@@ -6,6 +6,6 @@
 }: let
   dependencies = builtins.attrValues {inherit (pkgs) git neovim;};
   name = "config_setup";
-  script = ./config_setup.sh;
+  src = ./config_setup.sh;
 in
-  sysLib.makeShellScriptWithLibrary {inherit dependencies name script;}
+  sysLib.writeShellScriptWithLibrary {inherit dependencies name src;}
diff --git a/bootstrap/install/default.nix b/bootstrap/install/default.nix
index 054c28ec..4f520c92 100644
--- a/bootstrap/install/default.nix
+++ b/bootstrap/install/default.nix
@@ -6,6 +6,6 @@
 }: let
   dependencies = builtins.attrValues {inherit (pkgs) jq dash curl gawk btrfs-progs coreutils libuuid gptfdisk dosfstools toybox nix git;};
   name = "install";
-  script = ./install.sh;
+  src = ./install.sh;
 in
-  sysLib.makeShellScriptWithLibrary {inherit dependencies name script;}
+  sysLib.writeShellScriptWithLibrary {inherit dependencies name src;}
diff --git a/bootstrap/install/install.sh b/bootstrap/install/install.sh
index 8417448e..5e8c4eca 100755
--- a/bootstrap/install/install.sh
+++ b/bootstrap/install/install.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 bsc() {
     msg2 "$(btrfs subvolume create "$1" || die "Creating of subvol $1 failed")";
 }
diff --git a/bootstrap/setup/default.nix b/bootstrap/setup/default.nix
index b32a822b..905ddd1b 100644
--- a/bootstrap/setup/default.nix
+++ b/bootstrap/setup/default.nix
@@ -6,6 +6,6 @@
 }: let
   dependencies = builtins.attrValues {inherit (pkgs) dash gawk curl git nix gnugrep nixos-install-tools coreutils libuuid;};
   name = "setup";
-  script = ./setup.sh;
+  src = ./setup.sh;
 in
-  sysLib.makeShellScriptWithLibrary {inherit dependencies name script;}
+  sysLib.writeShellScriptWithLibrary {inherit dependencies name src;}
diff --git a/bootstrap/setup/setup.sh b/bootstrap/setup/setup.sh
index d66f4739..803123e3 100755
--- a/bootstrap/setup/setup.sh
+++ b/bootstrap/setup/setup.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 msg "Select a host-config:"
 hosts=$(mktmp);
 host="";
diff --git a/home-manager/config/gpg/default.nix b/home-manager/config/gpg/default.nix
index facb9ade..feba1298 100644
--- a/home-manager/config/gpg/default.nix
+++ b/home-manager/config/gpg/default.nix
@@ -4,9 +4,9 @@
   pkgs,
   ...
 }: let
-  agent-program = sysLib.makeShellScriptWithLibrary {
+  agent-program = sysLib.writeShellScriptWithLibrary {
     name = "onlykey-gpg-agent";
-    script = ./agent-program;
+    src = ./agent-program;
     dependencies = with pkgs; [
       python3
       onlykey-agent
diff --git a/home-manager/config/lf/commands/default.nix b/home-manager/config/lf/commands/default.nix
index 0a58302d..a44db5ac 100644
--- a/home-manager/config/lf/commands/default.nix
+++ b/home-manager/config/lf/commands/default.nix
@@ -8,9 +8,9 @@
     dependencies,
     ...
   }:
-    sysLib.makeShellScriptWithLibraryAndKeepPath {
+    sysLib.writeShellScriptWithLibraryAndKeepPath {
       name = "${builtins.baseNameOf file}";
-      script = file;
+      src = file;
       dependencies = dependencies ++ (builtins.attrValues {inherit (pkgs) dash coreutils;});
     }
     + "/bin/${builtins.baseNameOf file}";
diff --git a/home-manager/config/lf/commands/scripts/archive b/home-manager/config/lf/commands/scripts/archive
index fd032dd4..617a4ace 100755
--- a/home-manager/config/lf/commands/scripts/archive
+++ b/home-manager/config/lf/commands/scripts/archive
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 # Option '-f' disables pathname expansion which can be useful when $f, $fs, and
 # $fx variables contain names with '*' or '?' characters. However, this option
diff --git a/home-manager/config/lf/commands/scripts/broot_jump b/home-manager/config/lf/commands/scripts/broot_jump
index ff62ec90..6ff63ce9 100755
--- a/home-manager/config/lf/commands/scripts/broot_jump
+++ b/home-manager/config/lf/commands/scripts/broot_jump
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 tmp=$(mktmp)
 res="$(broot --outcmd $tmp && cat $tmp | sed 's/cd //')"
diff --git a/home-manager/config/lf/commands/scripts/chmod b/home-manager/config/lf/commands/scripts/chmod
index b1682090..bafb38c9 100755
--- a/home-manager/config/lf/commands/scripts/chmod
+++ b/home-manager/config/lf/commands/scripts/chmod
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 readp "Mode Bits: " bits
 
diff --git a/home-manager/config/lf/commands/scripts/clear_trash b/home-manager/config/lf/commands/scripts/clear_trash
index e1ee3d1e..b57e8a00 100755
--- a/home-manager/config/lf/commands/scripts/clear_trash
+++ b/home-manager/config/lf/commands/scripts/clear_trash
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 # could also use --force, for instand removal
 trash list | fzf --multi | awk '{print $NF}' | xargs trash empty --match=exact
diff --git a/home-manager/config/lf/commands/scripts/dl_file b/home-manager/config/lf/commands/scripts/dl_file
index 373386f8..0988bca6 100755
--- a/home-manager/config/lf/commands/scripts/dl_file
+++ b/home-manager/config/lf/commands/scripts/dl_file
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 # Provides the ability to download a file by dropping it into a window
 
diff --git a/home-manager/config/lf/commands/scripts/dragon b/home-manager/config/lf/commands/scripts/dragon
index fce161be..a6fe0355 100755
--- a/home-manager/config/lf/commands/scripts/dragon
+++ b/home-manager/config/lf/commands/scripts/dragon
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 dragon -a -x "$fx"
 # vim: ft=sh
diff --git a/home-manager/config/lf/commands/scripts/dragon_individual b/home-manager/config/lf/commands/scripts/dragon_individual
index 7adf6924..1cec01b2 100755
--- a/home-manager/config/lf/commands/scripts/dragon_individual
+++ b/home-manager/config/lf/commands/scripts/dragon_individual
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 dragon "$fx"
 # vim: ft=sh
diff --git a/home-manager/config/lf/commands/scripts/dragon_stay b/home-manager/config/lf/commands/scripts/dragon_stay
index aff9d01d..f0379680 100755
--- a/home-manager/config/lf/commands/scripts/dragon_stay
+++ b/home-manager/config/lf/commands/scripts/dragon_stay
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 dragon -a "$fx"
 # vim: ft=sh
diff --git a/home-manager/config/lf/commands/scripts/fzf_jump b/home-manager/config/lf/commands/scripts/fzf_jump
index e0995761..31fad6ef 100755
--- a/home-manager/config/lf/commands/scripts/fzf_jump
+++ b/home-manager/config/lf/commands/scripts/fzf_jump
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 res="$(fd . --maxdepth 3 | fzf --header='Jump to location')"
 if [ -f "$res" ]; then
diff --git a/home-manager/config/lf/commands/scripts/mk_dir b/home-manager/config/lf/commands/scripts/mk_dir
index fb69cf92..e24c9163 100755
--- a/home-manager/config/lf/commands/scripts/mk_dir
+++ b/home-manager/config/lf/commands/scripts/mk_dir
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 readp "Directory Name: " dir
 mkdir "$dir"
diff --git a/home-manager/config/lf/commands/scripts/mk_file b/home-manager/config/lf/commands/scripts/mk_file
index eef8df4b..5c98b400 100755
--- a/home-manager/config/lf/commands/scripts/mk_file
+++ b/home-manager/config/lf/commands/scripts/mk_file
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 readp "File Name: " name
 "$EDITOR" "$name"
diff --git a/home-manager/config/lf/commands/scripts/mk_ln b/home-manager/config/lf/commands/scripts/mk_ln
index 066150bd..7d626345 100755
--- a/home-manager/config/lf/commands/scripts/mk_ln
+++ b/home-manager/config/lf/commands/scripts/mk_ln
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 while IFS= read -r i;do
     set -- "$@" "$i"
diff --git a/home-manager/config/lf/commands/scripts/mk_scr b/home-manager/config/lf/commands/scripts/mk_scr
index 6857e8f6..9d404c87 100755
--- a/home-manager/config/lf/commands/scripts/mk_scr
+++ b/home-manager/config/lf/commands/scripts/mk_scr
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 script=$(mktmp)
 cat << EOF > $script
diff --git a/home-manager/config/lf/commands/scripts/open b/home-manager/config/lf/commands/scripts/open
index 2065eee3..a0257844 100755
--- a/home-manager/config/lf/commands/scripts/open
+++ b/home-manager/config/lf/commands/scripts/open
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 case $(file --mime-type "$f" -bL) in
     text/*|application/json) "$EDITOR" "$f";;
diff --git a/home-manager/config/lf/commands/scripts/open_config b/home-manager/config/lf/commands/scripts/open_config
index 55ae68cb..63e0c1b6 100755
--- a/home-manager/config/lf/commands/scripts/open_config
+++ b/home-manager/config/lf/commands/scripts/open_config
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 "$EDITOR" "$(bookmenu -b ~/.config/bookmenu/configs -f fzf -o)" # TODO implement this
 # vim: ft=sh
diff --git a/home-manager/config/lf/commands/scripts/restore_trash b/home-manager/config/lf/commands/scripts/restore_trash
index 22c16888..147bfd2d 100755
--- a/home-manager/config/lf/commands/scripts/restore_trash
+++ b/home-manager/config/lf/commands/scripts/restore_trash
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 trash list | fzf --multi | awk '{print $NF}' | xargs trash restore --match=exact
 # vim: ft=sh
diff --git a/home-manager/config/lf/commands/scripts/set_wall_paper b/home-manager/config/lf/commands/scripts/set_wall_paper
index 50cc9656..d4b38365 100755
--- a/home-manager/config/lf/commands/scripts/set_wall_paper
+++ b/home-manager/config/lf/commands/scripts/set_wall_paper
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 die "No yet implemented" # TODO do what the 'die' says
 #sed -i "s,export AWMWALLPAPER='.*',export AWMWALLPAPER='${f}'," ${ZDOTDIR}/.zshenv
diff --git a/home-manager/config/lf/commands/scripts/stripspace b/home-manager/config/lf/commands/scripts/stripspace
index 65dabc4c..59971a0b 100755
--- a/home-manager/config/lf/commands/scripts/stripspace
+++ b/home-manager/config/lf/commands/scripts/stripspace
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 files=$(mktmp);
 echo "$fx" > $files;
diff --git a/home-manager/config/lf/commands/scripts/trash b/home-manager/config/lf/commands/scripts/trash
index 9e2e6aa4..e3a5810b 100755
--- a/home-manager/config/lf/commands/scripts/trash
+++ b/home-manager/config/lf/commands/scripts/trash
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 trash_output=$(mktmp);
 expected_error_output=$(mktmp);
diff --git a/home-manager/config/lf/commands/scripts/unarchive b/home-manager/config/lf/commands/scripts/unarchive
index dfa82c9a..b0e3ab10 100755
--- a/home-manager/config/lf/commands/scripts/unarchive
+++ b/home-manager/config/lf/commands/scripts/unarchive
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 # extract the current file with the right command
 # (xkcd link: https://xkcd.com/1168/)
diff --git a/home-manager/config/yambar/default.nix b/home-manager/config/yambar/default.nix
index f11a3300..76d3109d 100644
--- a/home-manager/config/yambar/default.nix
+++ b/home-manager/config/yambar/default.nix
@@ -13,9 +13,9 @@
     dependencies,
     ...
   }:
-    sysLib.makeShellScriptWithLibrary {
+    sysLib.writeShellScriptWithLibrary {
       name = "${builtins.baseNameOf file}";
-      script = file;
+      src = file;
       dependencies = dependencies ++ (builtins.attrValues {inherit (pkgs) dash;});
     }
     + "/bin/${builtins.baseNameOf file}";
diff --git a/home-manager/config/yambar/scripts/disk b/home-manager/config/yambar/scripts/disk
index dad41feb..d96a8683 100755
--- a/home-manager/config/yambar/scripts/disk
+++ b/home-manager/config/yambar/scripts/disk
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 # Main loop
 while true; do
@@ -20,5 +19,4 @@ while true; do
   sleep 1
 done
 
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
 # vim: ft=sh
diff --git a/home-manager/config/yambar/scripts/grades-average b/home-manager/config/yambar/scripts/grades-average
index 98e06858..b8b5c04c 100755
--- a/home-manager/config/yambar/scripts/grades-average
+++ b/home-manager/config/yambar/scripts/grades-average
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 while true; do
     grade=$(grades list average | awk '{print $2}');
@@ -13,5 +12,4 @@ while true; do
     sleep 1;
 done
 
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
 # vim: ft=sh
diff --git a/home-manager/config/yambar/scripts/network b/home-manager/config/yambar/scripts/network
index 45c164df..0d98b110 100755
--- a/home-manager/config/yambar/scripts/network
+++ b/home-manager/config/yambar/scripts/network
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 retest=120
 retest_if_con_fails=10
@@ -45,5 +44,4 @@ case "$backend" in
         ;;
 esac
 
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
 # vim: ft=sh
diff --git a/home-manager/config/yambar/scripts/sound-volume b/home-manager/config/yambar/scripts/sound-volume
index 8a9cf0d2..41230141 100755
--- a/home-manager/config/yambar/scripts/sound-volume
+++ b/home-manager/config/yambar/scripts/sound-volume
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 while true; do
     volume=$(pactl get-sink-volume 0 | awk 'BEGIN { FS="/" } {gsub("%","",$2); gsub(" ","",$2)} {printf $2}')
@@ -18,5 +17,4 @@ while true; do
     sleep 1;
 done
 
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
 # vim: ft=sh
diff --git a/home-manager/packages/scripts.nix b/home-manager/packages/scripts.nix
index ca377e18..73b52d37 100644
--- a/home-manager/packages/scripts.nix
+++ b/home-manager/packages/scripts.nix
@@ -8,9 +8,9 @@
     path,
     dependencies,
   }:
-    sysLib.makeShellScriptWithLibrary {
+    sysLib.writeShellScriptWithLibrary {
       inherit name;
-      script = ./scripts/${path}/${name};
+      src = ./scripts/${path}/${name};
       dependencies = dependencies ++ [pkgs.dash];
     };
   aumo-scr = write_script {
@@ -55,9 +55,9 @@
     path = "wrappers";
     dependencies = builtins.attrValues {}; # TODO add snap-sync
   };
-  ll-scr = sysLib.makeShellScriptWithLibraryUnwrapped {
+  ll-scr = sysLib.writeShellScriptWithLibraryUnwrapped {
     name = "ll";
-    script = ./scripts/wrappers/ll;
+    src = ./scripts/wrappers/ll;
   };
   # TODO this need to be replaced with a wayland alternative
   #  llp-scr = write_script {
diff --git a/home-manager/packages/scripts/apps/aumo b/home-manager/packages/scripts/apps/aumo
index df12c111..2a1054ad 100755
--- a/home-manager/packages/scripts/apps/aumo
+++ b/home-manager/packages/scripts/apps/aumo
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2046,2086
 
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 if [ "$1" = "-u" ];then udisksctl unmount -b $(cat $HOME/.cache/aumo/mnt_disk); exit 0; fi
 all_available_disks=$(mktemp)
diff --git a/home-manager/packages/scripts/apps/con2pdf b/home-manager/packages/scripts/apps/con2pdf
index a3e45e29..653af5cb 100755
--- a/home-manager/packages/scripts/apps/con2pdf
+++ b/home-manager/packages/scripts/apps/con2pdf
@@ -1,6 +1,7 @@
 #! /usr/bin/env dash
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 
 # needed for help() and version
diff --git a/home-manager/packages/scripts/small_functions/gtk-themes b/home-manager/packages/scripts/small_functions/gtk-themes
index 5c1049ed..3d81aee8 100755
--- a/home-manager/packages/scripts/small_functions/gtk-themes
+++ b/home-manager/packages/scripts/small_functions/gtk-themes
@@ -1,7 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 
 
@@ -18,7 +18,3 @@ gsettings set "$gnome_schema" gtk-theme "$gtk_theme"
 gsettings set "$gnome_schema" icon-theme "$icon_theme"
 gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
 gsettings set "$gnome_schema" font-name "$font_name"
-
-
-
-if [ -d /tmp/LIB_FILE_TEMP_DIR/ ];then rm -r /tmp/LIB_FILE_TEMP_DIR/; fi
diff --git a/home-manager/packages/scripts/small_functions/screen_shot b/home-manager/packages/scripts/small_functions/screen_shot
index 92c37fdd..d0cbeb5c 100755
--- a/home-manager/packages/scripts/small_functions/screen_shot
+++ b/home-manager/packages/scripts/small_functions/screen_shot
@@ -1,9 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 grim -g "$(slurp)" ~/media/pictures/screenshots/"$(date +%s)".png &&
     alacritty -e llp -command ":{{ set sortby atime; set reverse!; }}" ~/media/pictures/screenshots
-
-
diff --git a/home-manager/packages/scripts/small_functions/update-sys b/home-manager/packages/scripts/small_functions/update-sys
index 69f822b3..c1df4f48 100755
--- a/home-manager/packages/scripts/small_functions/update-sys
+++ b/home-manager/packages/scripts/small_functions/update-sys
@@ -1,7 +1,7 @@
 #!/usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 help() {
     cat << EOF
diff --git a/home-manager/packages/scripts/wrappers/ll b/home-manager/packages/scripts/wrappers/ll
index 16dd4c72..48bd0ad3 100755
--- a/home-manager/packages/scripts/wrappers/ll
+++ b/home-manager/packages/scripts/wrappers/ll
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 export LLP=0
 tmp="$(mktmp)"
diff --git a/home-manager/packages/scripts/wrappers/spodi b/home-manager/packages/scripts/wrappers/spodi
index 6f92140d..41d2b443 100755
--- a/home-manager/packages/scripts/wrappers/spodi
+++ b/home-manager/packages/scripts/wrappers/spodi
@@ -1,7 +1,7 @@
-#! /usr/bin/env dash
+#!/usr/bin/env dash
 
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 
 DOWN_DIR=/home/soispha/media/music/down/
diff --git a/home-manager/packages/scripts/wrappers/virsh-del b/home-manager/packages/scripts/wrappers/virsh-del
index 584c53c5..3bdd0af5 100755
--- a/home-manager/packages/scripts/wrappers/virsh-del
+++ b/home-manager/packages/scripts/wrappers/virsh-del
@@ -1,10 +1,10 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 virsh destroy "$1"
 virsh undefine "$1" --nvram
 virsh vol-delete --pool default "$1".qcow2
 
-
+# vim: ft=sh
diff --git a/home-manager/packages/scripts/wrappers/yti b/home-manager/packages/scripts/wrappers/yti
index 47e8cf3a..d335a337 100755
--- a/home-manager/packages/scripts/wrappers/yti
+++ b/home-manager/packages/scripts/wrappers/yti
@@ -1,8 +1,7 @@
 #! /usr/bin/env dash
-# shellcheck disable=SC2086
-# shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
 
+# shellcheck source=/dev/null
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 DOWN_DIR=/home/dt/media/playlist/down/
 
@@ -33,4 +32,4 @@ cd $DOWN_DIR || die "BUG: no $DOWN_DIR"
 
 unbuffer yt-dlp  --config-location "$config" "$1" | tee $DOWN_DIR/yt-dlp.log
 
-if [ -d /tmp/LIB_FILE_TEMP_DIR/ ];then rm -r /tmp/LIB_FILE_TEMP_DIR/; fi
+# vim: ft=sh
diff --git a/home-manager/wms/river/default.nix b/home-manager/wms/river/default.nix
index 752d4c79..77cb5eba 100644
--- a/home-manager/wms/river/default.nix
+++ b/home-manager/wms/river/default.nix
@@ -41,9 +41,9 @@
   };
 in {
   xdg.configFile."river/init".source =
-    sysLib.makeShellScriptWithLibraryAndKeepPath {
+    sysLib.writeShellScriptWithLibraryAndKeepPath {
       name = "river_init";
-      script = init_scr;
+      src = init_scr;
       dependencies = builtins.attrValues {
         river_init_lesser = river_init_lesser.packages.${system}.default;
         inherit
diff --git a/home-manager/wms/river/init b/home-manager/wms/river/init
index c74a73fe..59afa68a 100755
--- a/home-manager/wms/river/init
+++ b/home-manager/wms/river/init
@@ -1,7 +1,7 @@
 #!/usr/bin/env dash
-# shellcheck disable=SC2086
+
 # shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
+SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH
 
 err_fail() {
     if ! "$@";then
diff --git a/system/services/backup/default.nix b/system/services/backup/default.nix
index 20e080b0..7d96d3fe 100644
--- a/system/services/backup/default.nix
+++ b/system/services/backup/default.nix
@@ -6,9 +6,9 @@
   config,
   ...
 }: let
-  snap-sync-forked = sysLib.makeShellScriptWithLibrary {
+  snap-sync-forked = sysLib.writeShellScriptWithLibrary {
     name = "snap-sync-forked";
-    script = ./snap-sync-forked;
+    src = ./snap-sync-forked;
     dependencies = with pkgs; [
       bash
       btrfs-progs