build(treewide): Update flake and shell library

1 files changed, 7 insertions, 5 deletions

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