diff --git a/pkgs/default.nix b/pkgs/default.nix index b1ee834..ce69279 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,5 +6,6 @@ pkgs: { servo = pkgs.callPackage ./servo {}; rebuild-no-inhibit = pkgs.callPackage ./rebuild-no-inhibit {}; rebuild = pkgs.callPackage ./rebuild {}; + install-nix-no-inhibit = pkgs.callPackage ./install-nix-no-inhibit {}; install-nix = pkgs.callPackage ./install-nix {}; } diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix new file mode 100644 index 0000000..aef1360 --- /dev/null +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + writeShellApplication, +}: +writeShellApplication +{ + name = "install-nix-no-inhibit"; + + runtimeInputs = []; + + text = '' + # An install script for NixOS installation to /tmp + set -e + pushd /tmp > /dev/null + systemd-inhibit --what=idle rm -rf ./install-nix + systemd-inhibit --what=idle git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix + pushd ./install-nix/nixos/hosts > /dev/null + echo "Please choose the hostname you are installing to from the following list:" + i=1 + for d in */ + do + dirs[i++]="''${d%/}" + done + select dir in "''${dirs[@]}"; do echo "you selected ''${dir}"; break; done + popd > /dev/null + pushd ./install-nix > /dev/null + echo "NixOS Installing..." + systemd-inhibit --what=idle sudo nixos-install --flake .#"''${dir}" + popd > /dev/null + echo "Cleaning up repository in '/tmp/install-nix'..." + systemd-inhibit --what=idle rm -rf ./install-nix + popd > /dev/null + echo "NixOS Install Succeeded!" + ''; +} diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index 9cdd625..bfcf17e 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -10,27 +10,7 @@ writeShellApplication runtimeInputs = []; text = '' - # An install script for NixOS installation to /tmp - set -e - pushd /tmp > /dev/null - systemd-inhibit --what=idle rm -rf ./install-nix - systemd-inhibit --what=idle git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix - pushd ./install-nix/nixos/hosts > /dev/null - echo "Please choose the hostname you are installing to from the following list:" - i=1 - for d in */ - do - dirs[i++]="''${d%/}" - done - select dir in "''${dirs[@]}"; do echo "you selected ''${dir}"; break; done - popd > /dev/null - pushd ./install-nix > /dev/null - echo "NixOS Installing..." - systemd-inhibit --what=idle sudo nixos-install --flake .#"''${dir}" - popd > /dev/null - echo "Cleaning up repository in '/tmp/install-nix'..." - systemd-inhibit --what=idle rm -rf ./install-nix - popd > /dev/null - notify-send -e "NixOS Install Succeeded!" --icon=software-update-available + # A rebuild script for NixOS + sudo systemd-inhibit --who="NixOS Installer" --why="Installing NixOS to /mnt" install-nix-no-inhibit ''; }