diff options
| -rw-r--r-- | dotfiles/.bashrc | 2 | ||||
| -rw-r--r-- | dotfiles/.scripts/.git-prompt.sh (renamed from dotfiles/.git-prompt.sh) | 0 | ||||
| -rwxr-xr-x | setup.sh | 24 |
3 files changed, 15 insertions, 11 deletions
diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index b770827..5a4d6c1 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -65,7 +65,7 @@ GIT_PS1_SHOWCONFLICTSTATE=true GIT_PS1_SHOWCOLORHINTS=true -source ~/.git-prompt.sh +source ~/.scripts/.git-prompt.sh PROMPT_DIRTRIM=4 PS1='\e[0;33m\]\u@\h\e[m\] ∴ \e[0;34m\]\w\e[m\]$(__git_ps1)\n \$ \[\e]0;\a\]' PS2=' > ' diff --git a/dotfiles/.git-prompt.sh b/dotfiles/.scripts/.git-prompt.sh index 6186c47..6186c47 100644 --- a/dotfiles/.git-prompt.sh +++ b/dotfiles/.scripts/.git-prompt.sh @@ -229,24 +229,26 @@ log_info "Step 4: Deploying Dotfiles..." # User dotfiles cp -v dotfiles/.bash_profile "$USER_HOME/" -cp -v dotfiles/.git-prompt.sh "$USER_HOME/" -cp -v dotfiles/.bashrc "$USER_HOME/" -cp -v dotfiles/.inputrc "$USER_HOME/" +mkdir -pv "$USER_HOME/.scripts" +cp -v ./dotfiles/.scripts/.git-prompt.sh "$USER_HOME/.scripts/" +rm -f "$USER_HOME/.git-prompt.sh" +cp -v ./dotfiles/.bashrc "$USER_HOME/" +cp -v ./dotfiles/.inputrc "$USER_HOME/" mkdir -pv "$USER_HOME/.config/" "$USER_HOME/.local/bin/" "$USER_HOME/Pictures/" if [ -d "$USER_HOME/.config/fastfetch" ]; then mv "$USER_HOME/.config/fastfetch" "$USER_HOME/.config/fastfetch.bak.$(date +%s)" fi -cp -rv dotfiles/.config/fastfetch "$USER_HOME/.config/" +cp -rv ./dotfiles/.config/fastfetch "$USER_HOME/.config/" if [ -d "$USER_HOME/.config/nvim" ]; then mv "$USER_HOME/.config/nvim" "$USER_HOME/.config/nvim.bak.$(date +%s)" fi -cp -rv dotfiles/.config/nvim "$USER_HOME/.config/" +cp -rv ./dotfiles/.config/nvim "$USER_HOME/.config/" if [ -d "Pictures" ]; then - cp -v Pictures/* "$USER_HOME/Pictures/" 2>/dev/null || true + cp -v ./Pictures/* "$USER_HOME/Pictures/" 2>/dev/null || true fi # Safely handle Go directory structure @@ -264,11 +266,13 @@ fi # Root dotfiles deployment log_info "Deploying root user dotfiles..." -sudo cp -v dotfiles/.bash_profile /root/ -sudo cp -v dotfiles/.git-prompt.sh /root/ -sudo cp -v rootfiles/.bashrc /root/ +sudo cp -v ./dotfiles/.bash_profile /root/ +sudo mkdir -pv /root/.scripts +sudo cp -v ./dotfiles/.scripts/.git-prompt.sh /root/.scripts/ +sudo rm -f /root/.git-prompt.sh +sudo cp -v ./rootfiles/.bashrc /root/ sudo mkdir -pv /root/.config/ -sudo cp -rv dotfiles/.config/nvim /root/.config/ +sudo cp -rv ./dotfiles/.config/nvim /root/.config/ log_success "Arch Linux post-installation setup completed successfully!" |