diff options
author | Soispha <soispha@vhack.eu> | 2023-09-16 14:18:07 +0200 |
---|---|---|
committer | Soispha <soispha@vhack.eu> | 2023-09-16 14:18:07 +0200 |
commit | 21c0fae7ca335a2f6c0fa935f9a459915eef37fc (patch) | |
tree | dd0a7451dfc4046b5ac49b974423a321a7b42a20 | |
parent | fix(treewide): Update to the newest shell lib version (diff) | |
download | nixos-config-21c0fae7ca335a2f6c0fa935f9a459915eef37fc.tar.gz nixos-config-21c0fae7ca335a2f6c0fa935f9a459915eef37fc.zip |
fix(treewide): Update shell library
46 files changed, 54 insertions, 53 deletions
diff --git a/bootstrap/01_activate b/bootstrap/01_activate index 4dfdda32..63322803 100755 --- a/bootstrap/01_activate +++ b/bootstrap/01_activate @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH . %SCRIPT_ENSURE_CONFIG_VARIABLES diff --git a/bootstrap/01_install b/bootstrap/01_install index d21d73f7..cce30f62 100755 --- a/bootstrap/01_install +++ b/bootstrap/01_install @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH INSTALL=y . %SCRIPT_ENSURE_CONFIG_VARIABLES diff --git a/bootstrap/02_setup b/bootstrap/02_setup index 823ef34f..264eeca4 100755 --- a/bootstrap/02_setup +++ b/bootstrap/02_setup @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH . %SCRIPT_ENSURE_CONFIG_VARIABLES diff --git a/bootstrap/03_config_setup b/bootstrap/03_config_setup index 35621a98..df6fc5c8 100755 --- a/bootstrap/03_config_setup +++ b/bootstrap/03_config_setup @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH # clone packer.nvim to the needed dir, for the nvim install to work git clone --depth 1 https://github.com/wbthomason/packer.nvim /mnt/srv/home/soispha/.local/share/nvim/site/pack/packer/start/packer.nvim diff --git a/bootstrap/99_ensure_config_variables b/bootstrap/99_ensure_config_variables index 5ee2e7e9..727fc6de 100755 --- a/bootstrap/99_ensure_config_variables +++ b/bootstrap/99_ensure_config_variables @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH if ! [ "$NIX_ENVIRONMENT_VARIABLES_SET" ]; then if ! [ "$NIX_HOST" ]; then diff --git a/flake.lock b/flake.lock index d2a5b275..e15fb062 100644 --- a/flake.lock +++ b/flake.lock @@ -197,11 +197,11 @@ ] }, "locked": { - "lastModified": 1694865172, - "narHash": "sha256-cFJYi2jkTRfrxJpib60xIBzSKKMA8z/1FZh7aWi2hmI=", + "lastModified": 1694866534, + "narHash": "sha256-RgM2kUjmfQdRktCBVN/QySYG/xwf4YKhEixXMtwtXhQ=", "ref": "refs/heads/prime", - "rev": "0c00c51603d148f6dec50603596ac540b6cd70d5", - "revCount": 41, + "rev": "e1653d3dcf7ab2eabc2c9393d271d30a0b0822b5", + "revCount": 42, "type": "git", "url": "https://codeberg.org/soispha/flake_update.git" }, @@ -924,11 +924,11 @@ ] }, "locked": { - "lastModified": 1694865092, - "narHash": "sha256-TQHe+RwNtqO8o1tNKBMTMFwufzXGyOGg+29gvaAjaNg=", + "lastModified": 1694866483, + "narHash": "sha256-YBLysDfloiFK4RSBl35LWu1PxqRs4t7FOZEV6Ki1k0o=", "ref": "refs/heads/prime", - "rev": "7193b436090dd33b568a0334313348126f50c9aa", - "revCount": 87, + "rev": "998e29497e0369ff477c8539d5457a63bcefaa18", + "revCount": 92, "type": "git", "url": "https://codeberg.org/soispha/shell_library.git" }, diff --git a/hm/soispha/conf/lf/commands/scripts/archive b/hm/soispha/conf/lf/commands/scripts/archive index 078fb468..e55e97a1 100755 --- a/hm/soispha/conf/lf/commands/scripts/archive +++ b/hm/soispha/conf/lf/commands/scripts/archive @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %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/hm/soispha/conf/lf/commands/scripts/broot_jump b/hm/soispha/conf/lf/commands/scripts/broot_jump index eabde988..7e1ef549 100755 --- a/hm/soispha/conf/lf/commands/scripts/broot_jump +++ b/hm/soispha/conf/lf/commands/scripts/broot_jump @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH tmp=$(mktmp) res="$(broot --outcmd "$tmp" && sed 's/cd //' "$tmp")" diff --git a/hm/soispha/conf/lf/commands/scripts/chmod b/hm/soispha/conf/lf/commands/scripts/chmod index 06943d9b..71e03e3c 100755 --- a/hm/soispha/conf/lf/commands/scripts/chmod +++ b/hm/soispha/conf/lf/commands/scripts/chmod @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH readp "Mode bits: " bits diff --git a/hm/soispha/conf/lf/commands/scripts/clear_trash b/hm/soispha/conf/lf/commands/scripts/clear_trash index 5b9bd5d7..2fa44cfb 100755 --- a/hm/soispha/conf/lf/commands/scripts/clear_trash +++ b/hm/soispha/conf/lf/commands/scripts/clear_trash @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %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/hm/soispha/conf/lf/commands/scripts/cow_cp b/hm/soispha/conf/lf/commands/scripts/cow_cp index 1e79dc20..9c3491f8 100755 --- a/hm/soispha/conf/lf/commands/scripts/cow_cp +++ b/hm/soispha/conf/lf/commands/scripts/cow_cp @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH # source: https://github.com/gokcehan/lf/wiki/Tips#use-copy-on-write-when-possible # diff --git a/hm/soispha/conf/lf/commands/scripts/dl_file b/hm/soispha/conf/lf/commands/scripts/dl_file index 07504e4f..3fc91c63 100755 --- a/hm/soispha/conf/lf/commands/scripts/dl_file +++ b/hm/soispha/conf/lf/commands/scripts/dl_file @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH # Provides the ability to download a file by dropping it into a window diff --git a/hm/soispha/conf/lf/commands/scripts/dragon b/hm/soispha/conf/lf/commands/scripts/dragon index c27e546b..0f828c23 100755 --- a/hm/soispha/conf/lf/commands/scripts/dragon +++ b/hm/soispha/conf/lf/commands/scripts/dragon @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH while read -r file; do set -- "$@" "$file" diff --git a/hm/soispha/conf/lf/commands/scripts/dragon_individual b/hm/soispha/conf/lf/commands/scripts/dragon_individual index f1b65ecd..92ce91ad 100755 --- a/hm/soispha/conf/lf/commands/scripts/dragon_individual +++ b/hm/soispha/conf/lf/commands/scripts/dragon_individual @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH while read -r file; do set -- "$@" "$file" diff --git a/hm/soispha/conf/lf/commands/scripts/dragon_stay b/hm/soispha/conf/lf/commands/scripts/dragon_stay index 3f441ef6..fdda1d15 100755 --- a/hm/soispha/conf/lf/commands/scripts/dragon_stay +++ b/hm/soispha/conf/lf/commands/scripts/dragon_stay @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH while read -r file; do set -- "$@" "$file"; diff --git a/hm/soispha/conf/lf/commands/scripts/fzf_jump b/hm/soispha/conf/lf/commands/scripts/fzf_jump index c65c6324..aa067325 100755 --- a/hm/soispha/conf/lf/commands/scripts/fzf_jump +++ b/hm/soispha/conf/lf/commands/scripts/fzf_jump @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH res="$(fd . --maxdepth 3 | fzf --header='Jump to location')" diff --git a/hm/soispha/conf/lf/commands/scripts/go_project_root b/hm/soispha/conf/lf/commands/scripts/go_project_root index 9fac3d09..84e46896 100755 --- a/hm/soispha/conf/lf/commands/scripts/go_project_root +++ b/hm/soispha/conf/lf/commands/scripts/go_project_root @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH flake_base_dir="$(search_flake_base_dir)"; if [ "$flake_base_dir" ]; then diff --git a/hm/soispha/conf/lf/commands/scripts/mk_dir b/hm/soispha/conf/lf/commands/scripts/mk_dir index 0ae5b6c0..8971bc2e 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_dir +++ b/hm/soispha/conf/lf/commands/scripts/mk_dir @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH prompt "Directory Name: " name="" diff --git a/hm/soispha/conf/lf/commands/scripts/mk_file b/hm/soispha/conf/lf/commands/scripts/mk_file index 93049e76..999b7c33 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_file +++ b/hm/soispha/conf/lf/commands/scripts/mk_file @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH prompt "File name: " name="" diff --git a/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit b/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit index 19f2e429..6c07cd1f 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit +++ b/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH prompt "File name: " name="" diff --git a/hm/soispha/conf/lf/commands/scripts/mk_ln b/hm/soispha/conf/lf/commands/scripts/mk_ln index 24b34af3..7f9a3e4d 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_ln +++ b/hm/soispha/conf/lf/commands/scripts/mk_ln @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH while IFS= read -r i;do set -- "$@" "$i" diff --git a/hm/soispha/conf/lf/commands/scripts/mk_scr_default b/hm/soispha/conf/lf/commands/scripts/mk_scr_default index 0fad1171..7e2ee34e 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_scr_default +++ b/hm/soispha/conf/lf/commands/scripts/mk_scr_default @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH prompt "Script name: " diff --git a/hm/soispha/conf/lf/commands/scripts/mk_scr_temp b/hm/soispha/conf/lf/commands/scripts/mk_scr_temp index 178242cb..0d4e1c05 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_scr_temp +++ b/hm/soispha/conf/lf/commands/scripts/mk_scr_temp @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH prompt "Script name: " diff --git a/hm/soispha/conf/lf/commands/scripts/open b/hm/soispha/conf/lf/commands/scripts/open index 3a551186..3f75f151 100755 --- a/hm/soispha/conf/lf/commands/scripts/open +++ b/hm/soispha/conf/lf/commands/scripts/open @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH case $(file --mime-type "$f" -bL) in text/*|application/json|application/vnd.hp-HPGL) "$EDITOR" "$f";; diff --git a/hm/soispha/conf/lf/commands/scripts/open_config b/hm/soispha/conf/lf/commands/scripts/open_config index 008d761e..e117cc94 100755 --- a/hm/soispha/conf/lf/commands/scripts/open_config +++ b/hm/soispha/conf/lf/commands/scripts/open_config @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH "$EDITOR" "$(bookmenu -b ~/.config/bookmenu/configs -f fzf -o)" # TODO: implement this # vim: ft=sh diff --git a/hm/soispha/conf/lf/commands/scripts/restore_trash b/hm/soispha/conf/lf/commands/scripts/restore_trash index 948bd665..0e0392a8 100755 --- a/hm/soispha/conf/lf/commands/scripts/restore_trash +++ b/hm/soispha/conf/lf/commands/scripts/restore_trash @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH trash list | fzf --multi | awk '{print $NF}' | xargs trash restore --match=exact # vim: ft=sh diff --git a/hm/soispha/conf/lf/commands/scripts/set_wall_paper b/hm/soispha/conf/lf/commands/scripts/set_wall_paper index 609731f6..34a0cf0f 100755 --- a/hm/soispha/conf/lf/commands/scripts/set_wall_paper +++ b/hm/soispha/conf/lf/commands/scripts/set_wall_paper @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %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/hm/soispha/conf/lf/commands/scripts/stripspace b/hm/soispha/conf/lf/commands/scripts/stripspace index cb7c6085..17b75c68 100755 --- a/hm/soispha/conf/lf/commands/scripts/stripspace +++ b/hm/soispha/conf/lf/commands/scripts/stripspace @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH files=$(mktmp); echo "$fx" > "$files"; diff --git a/hm/soispha/conf/lf/commands/scripts/trash b/hm/soispha/conf/lf/commands/scripts/trash index 9203e366..babe9870 100755 --- a/hm/soispha/conf/lf/commands/scripts/trash +++ b/hm/soispha/conf/lf/commands/scripts/trash @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH trash_output=$(mktmp); expected_error_output=$(mktmp); diff --git a/hm/soispha/conf/lf/commands/scripts/unarchive b/hm/soispha/conf/lf/commands/scripts/unarchive index 4926ba80..e2973121 100755 --- a/hm/soispha/conf/lf/commands/scripts/unarchive +++ b/hm/soispha/conf/lf/commands/scripts/unarchive @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH # extract the current file with the right command # (xkcd link: https://xkcd.com/1168/) diff --git a/hm/soispha/conf/yambar/scripts/disk b/hm/soispha/conf/yambar/scripts/disk index 047a0160..e519d376 100755 --- a/hm/soispha/conf/yambar/scripts/disk +++ b/hm/soispha/conf/yambar/scripts/disk @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH # Main loop while true; do diff --git a/hm/soispha/conf/yambar/scripts/grades-average b/hm/soispha/conf/yambar/scripts/grades-average index ddbf38be..b76c0938 100755 --- a/hm/soispha/conf/yambar/scripts/grades-average +++ b/hm/soispha/conf/yambar/scripts/grades-average @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH while true; do grade="$(grades list average | awk '{print $2}')"; diff --git a/hm/soispha/conf/yambar/scripts/network b/hm/soispha/conf/yambar/scripts/network index ca7223f1..117c7102 100755 --- a/hm/soispha/conf/yambar/scripts/network +++ b/hm/soispha/conf/yambar/scripts/network @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH retest=120 retest_if_con_fails=10 diff --git a/hm/soispha/conf/yambar/scripts/sound-volume b/hm/soispha/conf/yambar/scripts/sound-volume index 494a1674..0ac4c204 100755 --- a/hm/soispha/conf/yambar/scripts/sound-volume +++ b/hm/soispha/conf/yambar/scripts/sound-volume @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH while true; do volume="$(pactl get-sink-volume 0 | awk 'BEGIN { FS="/" } {gsub("%","",$2); gsub(" ","",$2)} {printf $2}')" diff --git a/hm/soispha/conf/zsh/default.nix b/hm/soispha/conf/zsh/default.nix index 6d33dda6..dfe5d06c 100644 --- a/hm/soispha/conf/zsh/default.nix +++ b/hm/soispha/conf/zsh/default.nix @@ -71,7 +71,8 @@ + builtins.readFile ./config/zsh-prompt.sh + builtins.readFile ./config/custom_cursor.sh + builtins.readFile "${pkgs.fzf}/share/fzf/key-bindings.zsh" - + ''SHELL_LIBRARY_VERSION="1.3.1" source ${shell_library.rawLib.${system}}''; + + ''SHELL_LIBRARY_VERSION="1.4.2" source ${shell_library.rawLib.${system}}''; + shellAliases = { ll = ". ll"; hisea = "history 0 | grep"; diff --git a/hm/soispha/pkgs/scripts/apps/aumo b/hm/soispha/pkgs/scripts/apps/aumo index 557c62aa..81e704c8 100755 --- a/hm/soispha/pkgs/scripts/apps/aumo +++ b/hm/soispha/pkgs/scripts/apps/aumo @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH # TODO: rewrite this diff --git a/hm/soispha/pkgs/scripts/apps/con2pdf b/hm/soispha/pkgs/scripts/apps/con2pdf index 04cce783..ef1aaa14 100755 --- a/hm/soispha/pkgs/scripts/apps/con2pdf +++ b/hm/soispha/pkgs/scripts/apps/con2pdf @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH # needed for help() and version diff --git a/hm/soispha/pkgs/scripts/small_functions/gtk-themes b/hm/soispha/pkgs/scripts/small_functions/gtk-themes index 13f019a5..f86d8d41 100755 --- a/hm/soispha/pkgs/scripts/small_functions/gtk-themes +++ b/hm/soispha/pkgs/scripts/small_functions/gtk-themes @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH # TODO: document, what this does diff --git a/hm/soispha/pkgs/scripts/small_functions/screen_shot b/hm/soispha/pkgs/scripts/small_functions/screen_shot index 19713e25..cc98b1bf 100755 --- a/hm/soispha/pkgs/scripts/small_functions/screen_shot +++ b/hm/soispha/pkgs/scripts/small_functions/screen_shot @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH date="$(date +%s)" grim -g "$(slurp)" "$HOME/media/pictures/screenshots/$date.png" && diff --git a/hm/soispha/pkgs/scripts/small_functions/update-sys b/hm/soispha/pkgs/scripts/small_functions/update-sys index d99a0416..d48ca4bf 100755 --- a/hm/soispha/pkgs/scripts/small_functions/update-sys +++ b/hm/soispha/pkgs/scripts/small_functions/update-sys @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH help() { cat << EOF diff --git a/hm/soispha/pkgs/scripts/wrappers/ll b/hm/soispha/pkgs/scripts/wrappers/ll index 6830b7ff..cbf49af4 100755 --- a/hm/soispha/pkgs/scripts/wrappers/ll +++ b/hm/soispha/pkgs/scripts/wrappers/ll @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH last_directory="$(mktemp)" diff --git a/hm/soispha/pkgs/scripts/wrappers/neorg b/hm/soispha/pkgs/scripts/wrappers/neorg index cb7ea256..ecd830e8 100755 --- a/hm/soispha/pkgs/scripts/wrappers/neorg +++ b/hm/soispha/pkgs/scripts/wrappers/neorg @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH # these are used in version() AUTHORS="Soispha" diff --git a/hm/soispha/pkgs/scripts/wrappers/spodi b/hm/soispha/pkgs/scripts/wrappers/spodi index 08e4bd5e..c8fa56de 100755 --- a/hm/soispha/pkgs/scripts/wrappers/spodi +++ b/hm/soispha/pkgs/scripts/wrappers/spodi @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH DOWN_DIR="/home/soispha/media/music/down"; diff --git a/hm/soispha/pkgs/scripts/wrappers/virsh-del b/hm/soispha/pkgs/scripts/wrappers/virsh-del index 6bbc0961..f3f3a05f 100755 --- a/hm/soispha/pkgs/scripts/wrappers/virsh-del +++ b/hm/soispha/pkgs/scripts/wrappers/virsh-del @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH virsh destroy "$1" virsh undefine "$1" --nvram diff --git a/hm/soispha/pkgs/scripts/wrappers/yti b/hm/soispha/pkgs/scripts/wrappers/yti index 25f13040..8be3777f 100755 --- a/hm/soispha/pkgs/scripts/wrappers/yti +++ b/hm/soispha/pkgs/scripts/wrappers/yti @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH die "Use spodi instead!" # TODO: fix this script DOWN_DIR=/home/soispha/media/playlist/down/ diff --git a/hm/soispha/wms/river/init b/hm/soispha/wms/river/init index 7060ccdb..5cd2f8a5 100755 --- a/hm/soispha/wms/river/init +++ b/hm/soispha/wms/river/init @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.4.0" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="1.4.2" . %SHELL_LIBRARY_PATH err_fail() { if ! "$@";then |