diff --git a/flake.nix b/flake.nix index 695ab54..2e53b2e 100644 --- a/flake.nix +++ b/flake.nix @@ -174,35 +174,9 @@ install = pkgs.writeShellApplication { name = "install"; - runtimeInputs = with pkgs; [git gum]; + runtimeInputs = with pkgs; [git busybox gum]; text = '' - #!/bin/sh - - echo "Running script" - - if [ $# -gt 0 ]; then - SCRIPT_DIR=$1 - else - SCRIPT_DIR=~/.dotfiles - fi - - nix-shell -p git --command "git clone https://git.foglar.tech/foglar/dotfiles.git $SCRIPT_DIR" - sudo nixos-generate-config --show-hardware-config >$SCRIPT_DIR/kogami/hardware-configuration.nix - sudo nixos-generate-config --show-hardware-config >$SCRIPT_DIR/ginoza/hardware-configuration.nix - - sed -i "0,/shinya/s//$(whoami)/" $SCRIPT_DIR/flake.nix - - if [ -z $EDITOR ]; then - EDITOR=nano - fi - $EDITOR $SCRIPT_DIR/flake.nix - - profile=$(gum choose kogami ginoza) - sudo nixos-rebuild build --flake $SCRIPT_DIR#"${profile}" --update - - gum confirm "Do you want to switch to the new configuration?" && sudo nixos-rebuild switch --flake $SCRIPT_DIR#"${profile}" - gum confirm "Do you want to reboot now?" && systemctl reboot || echo "Please reboot later, to switch to the new configuration" - + ${./install.sh} "$@" ''; }; }); diff --git a/install.sh b/install.sh index b50b84a..6f66930 100755 --- a/install.sh +++ b/install.sh @@ -20,7 +20,7 @@ fi $EDITOR $SCRIPT_DIR/flake.nix profile=$(gum choose kogami ginoza) -sudo nixos-rebuild build --flake $SCRIPT_DIR#"${profile}" --update +sudo nixos-rebuild build --flake $SCRIPT_DIR#''"${profile}" --update gum confirm "Do you want to switch to the new configuration?" && sudo nixos-rebuild switch --flake $SCRIPT_DIR#"${profile}" gum confirm "Do you want to reboot now?" && systemctl reboot || echo "Please reboot later, to switch to the new configuration"