diff options
Diffstat (limited to '')
| -rwxr-xr-x | bootstrap/01_activate | 2 | ||||
| -rwxr-xr-x | bootstrap/01_install | 2 | ||||
| -rwxr-xr-x | bootstrap/02_setup | 2 | ||||
| -rwxr-xr-x | bootstrap/03_config_setup | 2 | ||||
| -rwxr-xr-x | bootstrap/99_ensure_config_variables | 2 | ||||
| -rw-r--r-- | bootstrap/default.nix | 12 |
6 files changed, 12 insertions, 10 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 |