From e8d8b14edf3de44a32e6f03d9291a93aba2f7415 Mon Sep 17 00:00:00 2001 From: TrudeEH Date: Mon, 25 Mar 2024 13:31:15 +0000 Subject: [PATCH] Update p to allow nix to run in the same shell, without a reboot. --- install.sh | 11 ++++------- scripts/p.sh | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/install.sh b/install.sh index fb54590f..6d761df2 100755 --- a/install.sh +++ b/install.sh @@ -13,10 +13,7 @@ elif [[ $d == "Arch" ]]; then fi p i stow -if [[ $? == 0 ]]; then - # Link dotfile home to $HOME - echo -e "${GREEN}[+] Symlinking dotfiles...${ENDCOLOR}" - stow -v -t $HOME home --adopt -else - echo -e "${YELLOW}[E] Installation not finished. Reboot your system and run the script again.${ENDCOLOR}" -fi + +# Link dotfile home to $HOME +echo -e "${GREEN}[+] Symlinking dotfiles...${ENDCOLOR}" +stow -v -t $HOME home --adopt diff --git a/scripts/p.sh b/scripts/p.sh index d077c702..bb2a769f 100755 --- a/scripts/p.sh +++ b/scripts/p.sh @@ -110,8 +110,8 @@ p() ( echo -e "${YELLOW}[E] Nix not found.${ENDCOLOR}" echo -e "${GREEN}[+] Installing the Nix package manager...${ENDCOLOR}" curl -L https://nixos.org/nix/install | sh - echo -e "${GREEN}[I] Installed Nix. Please reboot your device.${ENDCOLOR}" - return 2 + . $HOME/.nix-profile/etc/profile.d/nix.sh + echo -e "${GREEN}[I] Installed Nix.${ENDCOLOR}" fi # If no parameter