diff options
| author | Soispha <soispha@vhack.eu> | 2024-01-13 11:27:01 +0100 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2024-01-13 11:27:01 +0100 |
| commit | 95c9314232bdebbff89f81ca3ab721e230290cec (patch) | |
| tree | 7068a64c856ad5f655b4b12501c43b8a4711edcc | |
| parent | chore(version): v1.25.0 (diff) | |
| download | nixos-config-95c9314232bdebbff89f81ca3ab721e230290cec.tar.gz nixos-config-95c9314232bdebbff89f81ca3ab721e230290cec.zip | |
build(treewide): Update flake and shell library
75 files changed, 201 insertions, 153 deletions
diff --git a/bootstrap/01_activate b/bootstrap/01_activate index 9d6d38e3..d8306fcc 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH . %SCRIPT_ENSURE_CONFIG_VARIABLES diff --git a/bootstrap/01_install b/bootstrap/01_install index 6c6d8afd..2c54c369 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH INSTALL=y . %SCRIPT_ENSURE_CONFIG_VARIABLES diff --git a/bootstrap/02_setup b/bootstrap/02_setup index 9035bb7a..671dd697 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH . %SCRIPT_ENSURE_CONFIG_VARIABLES diff --git a/bootstrap/03_config_setup b/bootstrap/03_config_setup index 0ff39eb6..13b1da9b 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %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 0ff20d95..8ca94cc5 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.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH if ! [ "$NIX_ENVIRONMENT_VARIABLES_SET" ]; then if ! [ "$NIX_HOST" ]; then diff --git a/bootstrap/default.nix b/bootstrap/default.nix index 4898557a..1cbff9ea 100644 --- a/bootstrap/default.nix +++ b/bootstrap/default.nix @@ -5,33 +5,35 @@ }: let ensure_config_variables_dependencies = builtins.attrValues {inherit (pkgs) systemd jq dash gnugrep curl;}; replacementStrings = {SCRIPT_ENSURE_CONFIG_VARIABLES = "${ensure_config_variables}/bin/ensure_config_variables";}; - activate = sysLib.writeShellScriptWithLibrary { + activate = sysLib.writeShellScript { dependencies = builtins.attrValues {inherit (pkgs) jq gawk curl coreutils libuuid nix git;} ++ ensure_config_variables_dependencies; name = "activate"; src = ./01_activate; inherit replacementStrings; }; - install = sysLib.writeShellScriptWithLibrary { + install = sysLib.writeShellScript { dependencies = builtins.attrValues {inherit (pkgs) jq dash curl gawk btrfs-progs coreutils libuuid gptfdisk dosfstools toybox nix git;} ++ ensure_config_variables_dependencies; name = "install"; src = ./01_install; inherit replacementStrings; }; - setup = sysLib.writeShellScriptWithLibrary { + setup = sysLib.writeShellScript { dependencies = builtins.attrValues {inherit (pkgs) dash gawk curl git nix gnugrep nixos-install-tools coreutils libuuid;} ++ ensure_config_variables_dependencies; name = "setup"; src = ./02_setup; inherit replacementStrings; }; - config_setup = sysLib.writeShellScriptWithLibraryAndKeepPath { + config_setup = sysLib.writeShellScript { dependencies = builtins.attrValues {inherit (pkgs) git neovim;} ++ ensure_config_variables_dependencies; name = "config_setup"; src = ./03_config_setup; + keep_path = true; inherit replacementStrings; }; - ensure_config_variables = sysLib.writeShellScriptWithLibraryUnwrapped { + ensure_config_variables = sysLib.writeShellScript { name = "ensure_config_variables"; src = ./99_ensure_config_variables; + wrap = false; }; output = {inherit activate install setup config_setup ensure_config_variables;}; in diff --git a/flake.lock b/flake.lock index 9863c0d0..6f0a00a5 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1703439018, - "narHash": "sha256-VT+06ft/x3eMZ1MJxWzQP3zXFGcrxGo5VR2rB7t88hs=", + "lastModified": 1704819371, + "narHash": "sha256-oFUfPWrWGQTZaCM3byxwYwrMLwshDxVGOrMH5cVP/X8=", "owner": "ipetkov", "repo": "crane", - "rev": "afdcd41180e3dfe4dac46b5ee396e3b12ccc967a", + "rev": "5c234301a1277e4cc759c23a2a7a00a06ddd7111", "type": "github" }, "original": { @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1704072400, - "narHash": "sha256-Es4zcFoCJ+Pa9TN46VoqgNlYznuhc6s50LRcDqQEATs=", + "lastModified": 1705075138, + "narHash": "sha256-0slYsXoR1Sd5FwTfFZLYxAsI015+J4lvgvo55u4Gw1A=", "owner": "nix-community", "repo": "disko", - "rev": "59f915b45a38cb0ec0e97a713237877a06b43386", + "rev": "f78b6498f69e04514cb84393e5daba669198c1c1", "type": "github" }, "original": { @@ -133,17 +133,14 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { @@ -283,11 +280,11 @@ ] }, "locked": { - "lastModified": 1701883666, - "narHash": "sha256-2GhA3ztnzw5wk35v8/URYl8JPWATh097PNC6J2T3464=", + "lastModified": 1704257549, + "narHash": "sha256-45yD4A7J5yWqTZ823qmKDi4Ap9g8b7Y+AYr2QbQ/nXI=", "owner": "nix-community", "repo": "haumea", - "rev": "be70ace3588aa0811d6fcf13efb96bbba5a99c39", + "rev": "89459a9563be101e6e52705cb4d60fca4011c05a", "type": "github" }, "original": { @@ -303,11 +300,11 @@ ] }, "locked": { - "lastModified": 1704100519, - "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", + "lastModified": 1705104164, + "narHash": "sha256-pllCu3Hcm1wP/B0SUxgUXvHeEd4w8s2aVrEQRdIL1yo=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e91c5df192395753d8e6d55a0352109cb559790", + "rev": "0912d26b30332ae6a90e1b321ff88e80492127dd", "type": "github" }, "original": { @@ -340,7 +337,9 @@ "flake-compat": [ "flake-compat" ], - "flake-parts": "flake-parts", + "flake-parts": [ + "flake-parts" + ], "flake-utils": [ "flake-utils" ], @@ -398,6 +397,27 @@ "url": "https://codeberg.org/soispha/lf-rename.git" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixVim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704277720, + "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -421,9 +441,13 @@ }, "nixVim": { "inputs": { - "flake-utils": [ - "flake-utils" + "flake-parts": [ + "flake-parts" ], + "home-manager": [ + "home-manager" + ], + "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], @@ -432,11 +456,11 @@ ] }, "locked": { - "lastModified": 1704074057, - "narHash": "sha256-A8kZLLVTOtgU9aQvQf7v3UxvrEBc0KXKNh6GJnFEYCg=", + "lastModified": 1705099172, + "narHash": "sha256-1ZwpL1E53AJscPHbY6Vu34OJlJYey0NliJlC/d/bbso=", "owner": "nix-community", "repo": "nixvim", - "rev": "f2e808a519d9526cf7df9047f20f71c323c21ac9", + "rev": "749a8a38c4745ba2540c70f0b15f1c4af10da180", "type": "github" }, "original": { @@ -483,11 +507,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703852835, - "narHash": "sha256-38Ca5hzBDwB+KntfFkiLxKfnuVsVn7h2L7JIHCCLea0=", + "lastModified": 1705129105, + "narHash": "sha256-61825NJdot7wG9td5GcxQ6UVdw2y8xBPeZgDLrPU3B0=", "owner": "soispha", "repo": "nixpkgs", - "rev": "e76e9f5b6ffcc003dd2638b33f7dfdec0effeb94", + "rev": "22ec824d129581daaa54e65c291da2299606fc84", "type": "github" }, "original": { @@ -497,13 +521,31 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1704018918, - "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -528,11 +570,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1703546497, - "narHash": "sha256-CN/7HaEmHz+akXKejkRVhsxAm6HPGOmYBWMtgMkuROA=", + "lastModified": 1705060653, + "narHash": "sha256-puYyylgrBS4AFAHeyVRTjTUVD8DZdecJfymWJe7H438=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "528d500ea826383cc126a9be1e633fc92b19ce5d", + "rev": "e0b44e9e2d3aa855d1dd77b06f067cd0e0c3860d", "type": "github" }, "original": { @@ -560,11 +602,11 @@ ] }, "locked": { - "lastModified": 1703939133, - "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", + "lastModified": 1705072518, + "narHash": "sha256-90dERRuG781f0EWjn2AOtScZqsTcpIFLpY8TN2VbkL8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", + "rev": "274ae3979a0eacae422e1bbcf63b8b7a335e1114", "type": "github" }, "original": { @@ -644,6 +686,7 @@ "crane": "crane", "disko": "disko", "flake-compat": "flake-compat", + "flake-parts": "flake-parts", "flake-utils": "flake-utils", "flake_version_update": "flake_version_update", "generate_firefox_extensions": "generate_firefox_extensions", @@ -684,11 +727,11 @@ ] }, "locked": { - "lastModified": 1704075545, - "narHash": "sha256-L3zgOuVKhPjKsVLc3yTm2YJ6+BATyZBury7wnhyc8QU=", + "lastModified": 1705112162, + "narHash": "sha256-IAM0+Uijh/fwlfoeDrOwau9MxcZW3zeDoUHc6Z3xfqM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a0df72e106322b67e9c6e591fe870380bd0da0d5", + "rev": "9e0af26ffe52bf955ad5575888f093e41fba0104", "type": "github" }, "original": { @@ -748,11 +791,11 @@ ] }, "locked": { - "lastModified": 1704134457, - "narHash": "sha256-SSulItzeRlnnd4nlzrACYm5hVsqIgCY2gLMSYLwbf0Q=", + "lastModified": 1705137488, + "narHash": "sha256-32vfE9Zwo9SHZbawUOG/7pcVty6iIks8yqi8w+qg+Yk=", "ref": "refs/heads/prime", - "rev": "224bc8000522d1e028e64a686566ca4aeef3fa87", - "revCount": 132, + "rev": "0d6f9f042d908581bfa03bf8f92e552e493991f5", + "revCount": 159, "type": "git", "url": "https://codeberg.org/soispha/shell_library.git" }, diff --git a/flake.nix b/flake.nix index 0b3a7bf1..27013630 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,9 @@ flake-utils.follows = "flake-utils"; }; }; + flake-parts = { + url = "github:hercules-ci/flake-parts"; + }; haumea = { url = "github:nix-community/haumea"; inputs = { @@ -89,8 +92,9 @@ nixVim = { url = "github:nix-community/nixvim"; inputs = { + home-manager.follows = "home-manager"; + flake-parts.follows = "flake-parts"; nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; pre-commit-hooks.follows = "pre-commit-hooks"; }; }; @@ -138,6 +142,7 @@ nixpkgs.follows = "nixpkgs-stable"; flake-compat.follows = "flake-compat"; flake-utils.follows = "flake-utils"; + flake-parts.follows = "flake-parts"; crane.follows = "crane"; rust-overlay.follows = "rust-overlay"; pre-commit-hooks-nix.follows = "pre-commit-hooks"; 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"; 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 diff --git a/hm/soispha/wms/river/default.nix b/hm/soispha/wms/river/default.nix index fc29daa1..e887bdea 100644 --- a/hm/soispha/wms/river/default.nix +++ b/hm/soispha/wms/river/default.nix @@ -42,9 +42,10 @@ }; in { xdg.configFile."river/init".source = - sysLib.writeShellScriptWithLibraryAndKeepPath { + sysLib.writeShellScript { name = "river_init"; src = init_scr; + keep_path = true; dependencies = builtins.attrValues { river_init_lesser = river_init_lesser.packages.${system}.default; inherit diff --git a/hm/soispha/wms/river/init b/hm/soispha/wms/river/init index a595e12d..3d5906a7 100755 --- a/hm/soispha/wms/river/init +++ b/hm/soispha/wms/river/init @@ -1,7 +1,7 @@ #!/usr/bin/env bash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="1.10.2" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.0.9" . %SHELL_LIBRARY_PATH err_fail() { if ! "$@";then diff --git a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md index 0b7dcb26..5634bd00 100644 --- a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md +++ b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md @@ -2,7 +2,7 @@ | Repo | Last Update | Nix package name | Last checked | |:---|:---|:---|:---| -| [andrewferrier/debugprint.nvim](https://github.com/andrewferrier/debugprint.nvim) | 2023-12-28 | `debugprint-nvim` | 2024-01-01 | -| [ThePrimeagen/harpoon:master](https://github.com/ThePrimeagen/harpoon) | 2023-12-26 | `harpoon` | 2024-01-01 | -| [lmburns/lf.nvim](https://github.com/lmburns/lf.nvim) | 2023-10-03 | `lf-nvim` | 2024-01-01 | -| [nvim-telescope/telescope-bibtex.nvim](https://github.com/nvim-telescope/telescope-bibtex.nvim) | 2023-11-20 | `telescope-bibtex-nvim` | 2024-01-01 | +| [andrewferrier/debugprint.nvim](https://github.com/andrewferrier/debugprint.nvim) | 2023-12-28 | `debugprint-nvim` | 2024-01-13 | +| [ThePrimeagen/harpoon:master](https://github.com/ThePrimeagen/harpoon) | 2023-12-26 | `harpoon` | 2024-01-13 | +| [lmburns/lf.nvim](https://github.com/lmburns/lf.nvim) | 2023-10-03 | `lf-nvim` | 2024-01-13 | +| [nvim-telescope/telescope-bibtex.nvim](https://github.com/nvim-telescope/telescope-bibtex.nvim) | 2023-11-20 | `telescope-bibtex-nvim` | 2024-01-13 | diff --git a/sys/nixpkgs/pkgs/snap-sync-forked/default.nix b/sys/nixpkgs/pkgs/snap-sync-forked/default.nix index f110a4fa..964a277a 100644 --- a/sys/nixpkgs/pkgs/snap-sync-forked/default.nix +++ b/sys/nixpkgs/pkgs/snap-sync-forked/default.nix @@ -1,6 +1,6 @@ {sysLib}: [ (final: prev: { - snap-sync-forked = sysLib.writeShellScriptWithLibrary { + snap-sync-forked = sysLib.writeShellScript { name = "snap-sync-forked"; src = ./snap-sync-forked; dependencies = with prev; [ diff --git a/sys/svcs/xdg/default.nix b/sys/svcs/xdg/default.nix index 73d7efc3..f8e8f60f 100644 --- a/sys/svcs/xdg/default.nix +++ b/sys/svcs/xdg/default.nix @@ -13,9 +13,10 @@ settings = { filechooser = { default_dir = "/tmp"; - cmd = "${sysLib.writeShellScriptWithLibraryAndKeepPath { + cmd = "${sysLib.writeShellScript { src = ./scripts/lf_wrapper; name = "lf_wrapper"; + keep_path = true; dependencies = with pkgs; [ lf alacritty |