diff --git a/InstallScripts/fullinstall.sh b/InstallScripts/fullinstall.sh index 607cbbf..a635946 100755 --- a/InstallScripts/fullinstall.sh +++ b/InstallScripts/fullinstall.sh @@ -26,9 +26,9 @@ if [[ $install_choice == "a" ]]; then hyprpm add https://github.com/virtcode/hypr-dynamic-cursors hyprpm enable dynamic-cursors # Copy files - sudo cp -f -r ~/Dotfiles/wallpapers ~/ - sudo cp -r -f ~/Dotfiles/.config/* ~/.config/ - sudo cp -r -f ~/Dotfiles/.bashrc ~/ + sudo cp -a ~/Dotfiles/wallpapers ~/ + sudo cp -a ~/Dotfiles/.config/* ~/.config/ + sudo cp -a ~/Dotfiles/.bashrc ~/ notify-send "Open Terminal with MOD+Q" "Hello $USER,\nThank you for downloading my Dotfiles\n-EF" # Manual install section elif [[ $install_choice == "m" ]]; then @@ -45,6 +45,7 @@ elif [[ $install_choice == "m" ]]; then choice=${choice:-y} # Default to 'y' if empty if [[ "$choice" == "y" ]]; then yay -S $package + clear fi done wal -i ~/Dotfiles/wallpapers/pywallpaper.jpg -n @@ -73,8 +74,8 @@ elif [[ $install_choice == "m" ]]; then hyprpm enable dynamic-cursors fi # Copy files - sudo cp -f -r ~/Dotfiles/wallpapers ~/ - sudo cp -r -f ~/Dotfiles/.config/* ~/.config/ - sudo cp -r -f ~/Dotfiles/.bashrc ~/ + sudo cp -a ~/Dotfiles/wallpapers ~/ + sudo cp -a ~/Dotfiles/.config/* ~/.config/ + sudo cp -a ~/Dotfiles/.bashrc ~/ notify-send "Open Terminal with MOD+Q" "Hello $USER,\nThank you for downloading my Dotfiles\n-EF" fi diff --git a/InstallScripts/hyprlockinstall.sh b/InstallScripts/hyprlockinstall.sh index e4ebb6e..7b4d2e9 100755 --- a/InstallScripts/hyprlockinstall.sh +++ b/InstallScripts/hyprlockinstall.sh @@ -1,5 +1,5 @@ #!/bin/bash yay -S hyprlock pywal wal -i ~/Dotfiles/wallpapers/pywallpaper.jpg -sudo cp -r -f ~/Dotfiles/.config/wal ~/.config/ -sudo cp -r -f ~/Dotfiles/.config/hypr/hyprlock.conf ~/.config/hypr/ +sudo cp -a ~/Dotfiles/.config/wal ~/.config/ +sudo cp -a ~/Dotfiles/.config/hypr/hyprlock.conf ~/.config/hypr/ diff --git a/InstallScripts/install.sh b/InstallScripts/install.sh index 926781e..b2c0f8c 100755 --- a/InstallScripts/install.sh +++ b/InstallScripts/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -echo "Please choose an option:" +clear echo "1. All" echo "2. waybar" echo "3. wofi" @@ -11,27 +11,37 @@ echo "7. wlogout" echo "8. wallpaper solution" echo "9. starship" echo "0. GTK themes" -read -p "Please choose what to install: " choice +read -p "Please choose what to install (1,2,3,4,5,6,7,8,9,0): " choice if [ "$choice" -eq 1 ]; then + clear chmod +x ~/Dotfiles/InstallScripts/fullinstall.sh && ~/Dotfiles/InstallScripts/fullinstall.sh elif [ "$choice" -eq 2 ]; then + clear chmod +x ~/Dotfiles/InstallScripts/waybarinstall.sh && ~/Dotfiles/InstallScripts/waybarinstall.sh elif [ "$choice" -eq 3 ]; then + clear chmod +x ~/Dotfiles/InstallScripts/wofiinstall.sh && ~/Dotfiles/InstallScripts/wofiinstall.sh elif [ "$choice" -eq 4 ]; then + clear chmod +x ~/Dotfiles/InstallScripts/swayncinstall.sh && ~/Dotfiles/InstallScripts/swayncinstall.sh elif [ "$choice" -eq 5 ]; then + clear chmod +x ~/Dotfiles/InstallScripts/hyprlockinstall.sh && ~/Dotfiles/InstallScripts/hyprlockinstall.sh elif [ "$choice" -eq 6 ]; then + clear chmod +x ~/Dotfiles/InstallScripts/nviminstall.sh && ~/Dotfiles/InstallScripts/nviminstall.sh elif [ "$choice" -eq 7 ]; then + clear chmod +x ~/Dotfiles/InstallScripts/wlogoutinstall.sh && ~/Dotfiles/InstallScripts/wlogoutinstall.sh elif [ "$choice" -eq 8 ]; then + clear chmod +x ~/Dotfiles/InstallScripts/wallpapersolution.sh && ~/Dotfiles/InstallScripts/wallpapersolution.sh elif [ "$choice" -eq 9 ]; then + clear chmod +x ~/Dotfiles/InstallScripts/starshipinstall.sh && ~/Dotfiles/InstallScripts/starshipinstall.sh elif [ "$choice" -eq 0 ]; then + clear chmod +x ~/Dotfiles/InstallScripts/gtkthemesinstall.sh && ~/Dotfiles/InstallScripts/gtkthemesinstall.sh else echo "Invalid choice. Try Again" diff --git a/InstallScripts/nviminstall.sh b/InstallScripts/nviminstall.sh index 1124b89..e4f0ada 100755 --- a/InstallScripts/nviminstall.sh +++ b/InstallScripts/nviminstall.sh @@ -1,4 +1,4 @@ #!/bin/bash yay -S neovim pywal lazygit wal -i ~/Dotfiles/wallpapers/pywallpaper.jpg -sudo cp -r -f ~/Dotfiles/.config/nvim ~/.config/ +sudo cp -a ~/Dotfiles/.config/nvim ~/.config/ diff --git a/InstallScripts/starshipinstall.sh b/InstallScripts/starshipinstall.sh index 7df7373..1b8a141 100755 --- a/InstallScripts/starshipinstall.sh +++ b/InstallScripts/starshipinstall.sh @@ -1,3 +1,3 @@ #!/bin/bash yay -S starship -sudo cp -r -f ~/Dotfiles/.config/starship.toml ~/.config/ +sudo cp -a ~/Dotfiles/.config/starship.toml ~/.config/ diff --git a/InstallScripts/swayncinstall.sh b/InstallScripts/swayncinstall.sh index 86fa1a9..5cf8202 100755 --- a/InstallScripts/swayncinstall.sh +++ b/InstallScripts/swayncinstall.sh @@ -1,4 +1,4 @@ #!/bin/bash yay -S swaync gvfs pywal wal -i ~/Dotfiles/wallpapers/pywallpaper.jpg -sudo cp -r -f ~/Dotfiles/.config/swaync ~/.config/ +sudo cp -a ~/Dotfiles/.config/swaync ~/.config/ diff --git a/InstallScripts/wallpapersolution.sh b/InstallScripts/wallpapersolution.sh index 9cf2ed5..e8a6fc3 100755 --- a/InstallScripts/wallpapersolution.sh +++ b/InstallScripts/wallpapersolution.sh @@ -1,6 +1,6 @@ #!/bin/bash yay -S swww pywal fd wofi wal -i ~/Dotfiles/wallpapers/pywallpaper.jpg -sudo cp -r -f ~/Dotfiles/.config/hypr/wallpaper.sh ~/.config/hypr/wallpaper.sh -sudo cp -r -f ~/Dotfiles/.config/wofi/config1 ~/.config/wofi/ -sudo cp -r -f ~/Dotfiles/.config/wofi/style1.css ~/.config/wofi/ +sudo cp -a ~/Dotfiles/.config/hypr/wallpaper.sh ~/.config/hypr/wallpaper.sh +sudo cp -a ~/Dotfiles/.config/wofi/config1 ~/.config/wofi/ +sudo cp -a ~/Dotfiles/.config/wofi/style1.css ~/.config/wofi/ diff --git a/InstallScripts/waybarinstall.sh b/InstallScripts/waybarinstall.sh index a6c0483..b1df08a 100755 --- a/InstallScripts/waybarinstall.sh +++ b/InstallScripts/waybarinstall.sh @@ -3,4 +3,4 @@ yay -S waybar hyprpicker otf-codenewroman-nerd pywal wal -i ~/Dotfiles/wallpapers/pywallpaper.jpg yay -S blueman bluez systemctl enable bluetooth -sudo cp -r -f ~/Dotfiles/.config/waybar ~/.config/ +sudo cp -a ~/Dotfiles/.config/waybar ~/.config/ diff --git a/InstallScripts/wlogoutinstall.sh b/InstallScripts/wlogoutinstall.sh index ab51e72..dc8d5f0 100755 --- a/InstallScripts/wlogoutinstall.sh +++ b/InstallScripts/wlogoutinstall.sh @@ -1,4 +1,4 @@ #!/bin/bash yay -S wlogout pywal wal -i ~/Dotfiles/wallpapers/pywallpaper.jpg -sudo cp -r -f ~/Dotfiles/.config/wlogout ~/.config/ +sudo cp -a ~/Dotfiles/.config/wlogout ~/.config/ diff --git a/InstallScripts/wofiinstall.sh b/InstallScripts/wofiinstall.sh index ae8ec32..ea1d8e2 100755 --- a/InstallScripts/wofiinstall.sh +++ b/InstallScripts/wofiinstall.sh @@ -1,4 +1,4 @@ #!/bin/bash yay -S wofi pywal wal -i ~/Dotfiles/wallpapers/pywallpaper.jpg -sudo cp -r -f ~/Dotfiles/.config/wofi ~/.config/ +sudo cp -a ~/Dotfiles/.config/wofi ~/.config/