diff options
Diffstat (limited to 'hm/soispha/conf')
43 files changed, 55 insertions, 52 deletions
diff --git a/hm/soispha/conf/firefox/config/extensions/extensions.json b/hm/soispha/conf/firefox/config/extensions/extensions.json index 8e10a9ad..8570d4ac 100644 --- a/hm/soispha/conf/firefox/config/extensions/extensions.json +++ b/hm/soispha/conf/firefox/config/extensions/extensions.json @@ -3,17 +3,17 @@ "addonId": "addon@darkreader.org", "default_area": "navbar", "pname": "darkreader", - "sha256": "sha256:7c399ff32561886bb80dad0cafaf8f629792b0b71ff1efcf12667e05a2b38f1a", - "url": "https://addons.mozilla.org/firefox/downloads/file/4205543/darkreader-4.9.73.xpi", - "version": "4.9.73" + "sha256": "sha256:140a72b36750ba68a9da30d0f0df3ff192f58160b711b86c3d4f674e5be2bb2c", + "url": "https://addons.mozilla.org/firefox/downloads/file/4216652/darkreader-4.9.74.xpi", + "version": "4.9.74" }, "keepassxc-browser": { "addonId": "keepassxc-browser@keepassxc.org", "default_area": "navbar", "pname": "keepassxc-browser", - "sha256": "sha256:843d1181e8d0b0e9737258575586332fafb25a856e8e18da3527944885c69089", - "url": "https://addons.mozilla.org/firefox/downloads/file/4200248/keepassxc_browser-1.8.10.xpi", - "version": "1.8.10" + "sha256": "sha256:8baf4fef3f7dfffb993190d3b4f6b881c89e2aabcf4850fd9d39e5cffd57eac8", + "url": "https://addons.mozilla.org/firefox/downloads/file/4218010/keepassxc_browser-1.8.11.xpi", + "version": "1.8.11" }, "torproject-snowflake": { "addonId": "{b11bea1f-a888-4332-8d8a-cec2be7d24b9}", @@ -35,9 +35,9 @@ "addonId": "uBlock0@raymondhill.net", "default_area": "menupanel", "pname": "ublock-origin", - "sha256": "sha256:9797160908191710ff0858536ba6dc29ecad9923c30b2ad6d3e5e371d759e44d", - "url": "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi", - "version": "1.54.0" + "sha256": "sha256:a02ca1d32737c3437f97553e5caaead6479a66ac1f8ff3b84a06cfa6bb0c7647", + "url": "https://addons.mozilla.org/firefox/downloads/file/4216633/ublock_origin-1.55.0.xpi", + "version": "1.55.0" }, "vhack-libredirect": { "addonId": "vhack-libredirect@addons.vhack.eu", diff --git a/hm/soispha/conf/firefox/scripts/default.nix b/hm/soispha/conf/firefox/scripts/default.nix index a7270980..1127662b 100644 --- a/hm/soispha/conf/firefox/scripts/default.nix +++ b/hm/soispha/conf/firefox/scripts/default.nix @@ -14,7 +14,7 @@ dontUnpack = true; installPhase = "install -Dm755 ${./unzip_mozlz4.py} $out/bin/unzip_mozlz4"; }; - extract_cookies = sysLib.writeShellScriptWithLibrary { + extract_cookies = sysLib.writeShellScript { name = "extract_cookies"; src = ./extract_cookies.sh; dependencies = with pkgs; [ diff --git a/hm/soispha/conf/git/default.nix b/hm/soispha/conf/git/default.nix index 6cd9cd0e..828b7058 100644 --- a/hm/soispha/conf/git/default.nix +++ b/hm/soispha/conf/git/default.nix @@ -8,9 +8,10 @@ }: let gitIgnoreFile = ./git_ignore.git; gitTemplateFile = ./git_template.git; - commit = sysLib.writeShellScriptWithLibraryAndKeepPath { + commit = sysLib.writeShellScript { name = "commit"; src = ./scripts/commit; + keep_path = true; dependencies = with pkgs; [ git gnused diff --git a/hm/soispha/conf/git/scripts/commit b/hm/soispha/conf/git/scripts/commit index d4de400f..46f806ef 100755 --- a/hm/soispha/conf/git/scripts/commit +++ b/hm/soispha/conf/git/scripts/commit @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH ROOT="$(git rev-parse --show-toplevel)"; diff --git a/hm/soispha/conf/gpg/default.nix b/hm/soispha/conf/gpg/default.nix index 94b6141a..ab1440c5 100644 --- a/hm/soispha/conf/gpg/default.nix +++ b/hm/soispha/conf/gpg/default.nix @@ -5,7 +5,7 @@ pkgs, ... }: let - agent-program = sysLib.writeShellScriptWithLibrary { + agent-program = sysLib.writeShellScript { name = "onlykey-gpg-agent"; src = ./agent-program; dependencies = with pkgs; [ diff --git a/hm/soispha/conf/lf/commands/default.nix b/hm/soispha/conf/lf/commands/default.nix index a52cb2f0..5d7fa3ce 100644 --- a/hm/soispha/conf/lf/commands/default.nix +++ b/hm/soispha/conf/lf/commands/default.nix @@ -12,9 +12,10 @@ replacementStrings, ... }: - sysLib.writeShellScriptWithLibraryAndKeepPath { + sysLib.writeShellScript { name = "${builtins.baseNameOf file}"; src = file; + keep_path = true; dependencies = dependencies ++ (builtins.attrValues {inherit (pkgs) dash coreutils;}); inherit replacementStrings; } diff --git a/hm/soispha/conf/lf/commands/scripts/archive b/hm/soispha/conf/lf/commands/scripts/archive index a0337872..dcdfc8cd 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 ecdf880c..a461a526 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 8a00ceb0..63bbb54d 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 86565777..3811b289 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 def83c79..3bdb2370 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 acfad935..61008a7e 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 7c9bb913..528ed83e 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 a9159882..6fb89330 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 9628b0f0..afd6e057 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 b581f169..14124176 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 94b656c0..38d711a1 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 a7b89587..86648c6f 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 de0d32ac..aa130fd3 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 48445798..c3ece8dc 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 b6bd899a..00aa3396 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 06c2baeb..53a8d11b 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 4f7a5b16..54465b3c 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 d007aeec..7af5cc0d 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 a9cfd52e..250269cb 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 bb164a1e..128e54ab 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 2817cc9f..dc8ab078 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 d4b9cd16..502f9c0b 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 07dd0334..680c4602 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 d5173dd5..8207fe76 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH # extract the current file with the right command # (xkcd link: https://xkcd.com/1168/) diff --git a/hm/soispha/conf/taskwarrior/hooks/default.nix b/hm/soispha/conf/taskwarrior/hooks/default.nix index a01b1c17..4bac0ca7 100644 --- a/hm/soispha/conf/taskwarrior/hooks/default.nix +++ b/hm/soispha/conf/taskwarrior/hooks/default.nix @@ -31,7 +31,7 @@ projects_comma = builtins.concatStringsSep ", " projects; projects_pipe = builtins.concatStringsSep "|" projects; - enforce_policies = sysLib.writeShellScriptWithLibrary { + enforce_policies = sysLib.writeShellScript { name = "bin"; src = ./scripts/on-add_enforce-policies.sh; dependencies = with pkgs; [dash jq taskwarrior gnused gnugrep]; @@ -83,7 +83,7 @@ mkSyncGitRepo = type: { name = "${hookPath}/${type}_sync-git-repo"; value = { - source = "${sysLib.writeShellScriptWithLibrary { + source = "${sysLib.writeShellScript { name = "bin"; src = ./scripts + "/${type}_sync-git-repo.sh"; dependencies = with pkgs; [dash taskwarrior git]; diff --git a/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh b/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh index d1057509..446b4635 100755 --- a/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh +++ b/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH # override shell lib output to stdout eprint() { diff --git a/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh b/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh index 816e797d..a2e1ffbe 100755 --- a/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh +++ b/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH # override shell lib output to stdout eprint() { diff --git a/hm/soispha/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh b/hm/soispha/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh index ccbe39f9..019146d4 100755 --- a/hm/soispha/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh +++ b/hm/soispha/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH # override shell lib output to stdout eprint() { diff --git a/hm/soispha/conf/xdg/default.nix b/hm/soispha/conf/xdg/default.nix index 2b244b88..93f75887 100644 --- a/hm/soispha/conf/xdg/default.nix +++ b/hm/soispha/conf/xdg/default.nix @@ -4,9 +4,10 @@ config, ... }: let - url_handler = sysLib.writeShellScriptWithLibraryAndKeepPath { + url_handler = sysLib.writeShellScript { name = "url_handler"; src = ./url_handler; + keep_path = true; # Naming dependencies for this will be difficult, as it depend on overridden packages. dependencies = with pkgs; [ rofi diff --git a/hm/soispha/conf/xdg/url_handler b/hm/soispha/conf/xdg/url_handler index 5b4786cf..b01d5ca8 100755 --- a/hm/soispha/conf/xdg/url_handler +++ b/hm/soispha/conf/xdg/url_handler @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH project="$(echo "%ALL_PROJECTS_PIPE|nvim|zathura|" | rofi -sep "|" -dmenu)"; diff --git a/hm/soispha/conf/yambar/default.nix b/hm/soispha/conf/yambar/default.nix index f5f17b4a..67a77d8f 100644 --- a/hm/soispha/conf/yambar/default.nix +++ b/hm/soispha/conf/yambar/default.nix @@ -13,7 +13,7 @@ dependencies, ... }: - sysLib.writeShellScriptWithLibrary { + sysLib.writeShellScript { name = "${builtins.baseNameOf file}"; src = file; dependencies = dependencies ++ (builtins.attrValues {inherit (pkgs) dash;}); diff --git a/hm/soispha/conf/yambar/scripts/disk b/hm/soispha/conf/yambar/scripts/disk index 58754e3b..574d780b 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 a3c9c9cd..aed61199 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH while true; do grade="$(grades list average | awk '{print $2}')"; diff --git a/hm/soispha/conf/yambar/scripts/mpd_song_name b/hm/soispha/conf/yambar/scripts/mpd_song_name index 01bd1551..336192aa 100755 --- a/hm/soispha/conf/yambar/scripts/mpd_song_name +++ b/hm/soispha/conf/yambar/scripts/mpd_song_name @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH while true; do diff --git a/hm/soispha/conf/yambar/scripts/network b/hm/soispha/conf/yambar/scripts/network index 6ab60ac0..14ba3907 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 0ada40b7..6b195887 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 9a1f3a7e..a93dabce 100644 --- a/hm/soispha/conf/zsh/default.nix +++ b/hm/soispha/conf/zsh/default.nix @@ -72,7 +72,7 @@ + builtins.readFile ./config/command_not_found_insult.zsh + builtins.readFile ./config/custom_cursor.sh + builtins.readFile "${pkgs.fzf}/share/fzf/key-bindings.zsh" - + ''SHELL_LIBRARY_VERSION="1.10.2" source ${shell_library.rawLib.${system}}''; + + ''SHELL_LIBRARY_VERSION="2.0.9" source ${shell_library.rawLib.${system}}''; shellAliases = { ll = ". ll"; |