diff options
Diffstat (limited to '')
19 files changed, 31 insertions, 38 deletions
diff --git a/hm/soispha/pkgs/scripts.nix b/hm/soispha/pkgs/scripts.nix index c425e9df..944787c7 100644 --- a/hm/soispha/pkgs/scripts.nix +++ b/hm/soispha/pkgs/scripts.nix @@ -12,21 +12,12 @@ keep_path ? false, completions ? false, }: - if keep_path - then - sysLib.writeShellScriptWithLibraryAndKeepPath { - inherit name; - src = ./scripts/${path}/${name}; - dependencies = dependencies ++ [pkgs.dash]; - generateCompletions = completions; - } - else - sysLib.writeShellScriptWithLibrary { - inherit name; - src = ./scripts/${path}/${name}; - dependencies = dependencies ++ [pkgs.dash]; - generateCompletions = completions; - }; + sysLib.writeShellScript { + inherit name keep_path; + src = ./scripts/${path}/${name}; + dependencies = dependencies ++ [pkgs.dash]; + generateCompletions = completions; + }; write_python = { name, path, @@ -57,7 +48,7 @@ path = "apps"; dependencies = builtins.attrValues {inherit (pkgs) udisks gawk gnused gnugrep sudo;}; }; - con2pdf-scr = sysLib.writeShellScriptWithLibrary { + con2pdf-scr = sysLib.writeShellScript { name = "con2pdf"; src = ./scripts/apps/con2pdf; dependencies = builtins.attrValues {inherit (pkgs) sane-backends imagemagick coreutils fd;}; @@ -82,7 +73,7 @@ inherit (pkgs) jq fmt less locale; }; }; - filter-comments-scr = sysLib.writeShellScriptWithLibrary { + filter-comments-scr = sysLib.writeShellScript { name = "comments"; src = ./scripts/specific/ytcc/filter_comments.sh; dependencies = with pkgs; [jq fmt less locale] ++ [nest_comments-scr]; @@ -111,9 +102,10 @@ path = "small_functions"; dependencies = builtins.attrValues {inherit (pkgs) grim slurp wl-clipboard;}; }; - neorg-scr = sysLib.writeShellScriptWithLibraryAndKeepPath { + neorg-scr = sysLib.writeShellScript { name = "neorg"; src = ./scripts/specific/neorg/neorg; + keep_path = true; dependencies = with pkgs; [ cocogitto git-crypt @@ -129,7 +121,7 @@ ALL_PROJECTS_COMMA = "${config.soispha.taskwarrior.projects.projects_comma}"; ALL_PROJECTS_PIPE = "${config.soispha.taskwarrior.projects.projects_pipe}"; ALL_WORKSPACES = "${lib.strings.concatStringsSep "|" (builtins.attrNames config.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces)}"; - ID_GENERATION_FUNCTION = "${sysLib.writeShellScriptWithLibrary { + ID_GENERATION_FUNCTION = "${sysLib.writeShellScript { name = "neorg_id_function"; src = ./scripts/specific/neorg/neorg_id_function.sh; dependencies = with pkgs; [ @@ -184,9 +176,10 @@ ; }; }; - ll-scr = sysLib.writeShellScriptWithLibraryUnwrapped { + ll-scr = sysLib.writeShellScript { name = "ll"; src = ./scripts/wrappers/ll; + wrap = false; }; # TODO: this need to be replaced with a wayland alternative # llp-scr = write_shell { diff --git a/hm/soispha/pkgs/scripts/apps/aumo b/hm/soispha/pkgs/scripts/apps/aumo index c3c0cdc1..2011281d 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH # TODO: rewrite this diff --git a/hm/soispha/pkgs/scripts/apps/con2pdf b/hm/soispha/pkgs/scripts/apps/con2pdf index bf677d44..c2c746cd 100644 --- 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH # needed for help() and version diff --git a/hm/soispha/pkgs/scripts/apps/fupdate b/hm/soispha/pkgs/scripts/apps/fupdate index ef2b8471..3131d730 100644 --- a/hm/soispha/pkgs/scripts/apps/fupdate +++ b/hm/soispha/pkgs/scripts/apps/fupdate @@ -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 UPDATE_SCRIPT_NAME="update.sh"; diff --git a/hm/soispha/pkgs/scripts/small_functions/screenshot_persistent b/hm/soispha/pkgs/scripts/small_functions/screenshot_persistent index ff2ddc7a..94754863 100755 --- a/hm/soispha/pkgs/scripts/small_functions/screenshot_persistent +++ b/hm/soispha/pkgs/scripts/small_functions/screenshot_persistent @@ -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 # only generate a path (this could lead to a time-of-check/time-of-use bug) tmp="$(mktmp --dry-run)" diff --git a/hm/soispha/pkgs/scripts/small_functions/screenshot_temporary b/hm/soispha/pkgs/scripts/small_functions/screenshot_temporary index 729afd83..dd22e123 100755 --- a/hm/soispha/pkgs/scripts/small_functions/screenshot_temporary +++ b/hm/soispha/pkgs/scripts/small_functions/screenshot_temporary @@ -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 grim -g "$(slurp)" | wl-copy diff --git a/hm/soispha/pkgs/scripts/small_functions/update-sys b/hm/soispha/pkgs/scripts/small_functions/update-sys index ea85477f..eaa2eca0 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH help() { cat << EOF diff --git a/hm/soispha/pkgs/scripts/specific/neorg/neorg b/hm/soispha/pkgs/scripts/specific/neorg/neorg index d1766e62..9c48b50b 100755 --- a/hm/soispha/pkgs/scripts/specific/neorg/neorg +++ b/hm/soispha/pkgs/scripts/specific/neorg/neorg @@ -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 # these are used in version() AUTHORS="Soispha" diff --git a/hm/soispha/pkgs/scripts/specific/ytcc/description b/hm/soispha/pkgs/scripts/specific/ytcc/description index 53da6129..aa523c70 100755 --- a/hm/soispha/pkgs/scripts/specific/ytcc/description +++ b/hm/soispha/pkgs/scripts/specific/ytcc/description @@ -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 jq --raw-output '.description' "$XDG_RUNTIME_DIR/ytcc/running" | fmt -u -s | less diff --git a/hm/soispha/pkgs/scripts/specific/ytcc/filter_comments.sh b/hm/soispha/pkgs/scripts/specific/ytcc/filter_comments.sh index ed744ccb..0d0b4574 100755 --- a/hm/soispha/pkgs/scripts/specific/ytcc/filter_comments.sh +++ b/hm/soispha/pkgs/scripts/specific/ytcc/filter_comments.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 # This is the symlink to the active info.json file="$XDG_RUNTIME_DIR/ytcc/running"; diff --git a/hm/soispha/pkgs/scripts/specific/ytcc/yts b/hm/soispha/pkgs/scripts/specific/ytcc/yts index a18e4d51..9d07135d 100755 --- a/hm/soispha/pkgs/scripts/specific/ytcc/yts +++ b/hm/soispha/pkgs/scripts/specific/ytcc/yts @@ -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 TASK_UUID=ce4f9e07-8324-4570-8be6-967955e9271e # these are used in version() diff --git a/hm/soispha/pkgs/scripts/wrappers/hibernate b/hm/soispha/pkgs/scripts/wrappers/hibernate index 0a94eee7..eff99347 100755 --- a/hm/soispha/pkgs/scripts/wrappers/hibernate +++ b/hm/soispha/pkgs/scripts/wrappers/hibernate @@ -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 context="$(task _get rc.context)"; [ "$context" ] && task context none diff --git a/hm/soispha/pkgs/scripts/wrappers/ll b/hm/soispha/pkgs/scripts/wrappers/ll index 319369ea..65992862 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH last_directory="$(mktemp)" diff --git a/hm/soispha/pkgs/scripts/wrappers/lock b/hm/soispha/pkgs/scripts/wrappers/lock index 3fa7cc36..f3270860 100755 --- a/hm/soispha/pkgs/scripts/wrappers/lock +++ b/hm/soispha/pkgs/scripts/wrappers/lock @@ -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 context="$(task _get rc.context)"; diff --git a/hm/soispha/pkgs/scripts/wrappers/lyrics b/hm/soispha/pkgs/scripts/wrappers/lyrics index ec0da426..d2ce0feb 100755 --- a/hm/soispha/pkgs/scripts/wrappers/lyrics +++ b/hm/soispha/pkgs/scripts/wrappers/lyrics @@ -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 ( cd "$XDG_MUSIC_DIR" || die "No music dir!" diff --git a/hm/soispha/pkgs/scripts/wrappers/mpc-rm b/hm/soispha/pkgs/scripts/wrappers/mpc-rm index 4a87c071..ec76d9f1 100755 --- a/hm/soispha/pkgs/scripts/wrappers/mpc-rm +++ b/hm/soispha/pkgs/scripts/wrappers/mpc-rm @@ -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 cd "$XDG_MUSIC_DIR" || die "No music dir!" diff --git a/hm/soispha/pkgs/scripts/wrappers/spodi b/hm/soispha/pkgs/scripts/wrappers/spodi index 1936c7bc..e5131dac 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH # This path must not contain spaces DOWN_DIR="/home/soispha/media/music/down/spotify"; diff --git a/hm/soispha/pkgs/scripts/wrappers/virsh-del b/hm/soispha/pkgs/scripts/wrappers/virsh-del index e6a7b69e..62824f28 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 ad1915e5..fee19e1d 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH DOWN_DIR=/home/soispha/media/music/down/youtube |