diff --git a/.install/cleanup.sh b/.install/cleanup.sh index 0ba0abc..2de7c8b 100644 --- a/.install/cleanup.sh +++ b/.install/cleanup.sh @@ -15,29 +15,29 @@ fi # Check for running NetworkManager.service if [[ $(systemctl list-units --all -t service --full --no-legend "NetworkManager.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "NetworkManager.service" ]];then - echo "NetworkManager.service already running." + echo ":: NetworkManager.service already running." else sudo systemctl enable NetworkManager.service sudo systemctl start NetworkManager.service - echo "NetworkManager.service activated successfully." + echo ":: NetworkManager.service activated successfully." fi # Check for running bluetooth.service if [[ $(systemctl list-units --all -t service --full --no-legend "bluetooth.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "bluetooth.service" ]];then - echo "bluetooth.service already running." + echo ":: bluetooth.service already running." else sudo systemctl enable bluetooth.service sudo systemctl start bluetooth.service - echo "bluetooth.service activated successfully." + echo ":: bluetooth.service activated successfully." fi if [ -d ~/dotfiles/hypr/settings/ ] ;then rm -rf ~/dotfiles/hypr/settings - echo "~/dotfiles/hypr/settings removed." + echo ":: ~/dotfiles/hypr/settings removed." fi # Create default folder structure xdg-user-dirs-update echo -echo "Cleanup done." \ No newline at end of file +echo ":: Cleanup done." \ No newline at end of file diff --git a/.install/hyprland-dotfiles.sh b/.install/hyprland-dotfiles.sh index a90d318..c916962 100644 --- a/.install/hyprland-dotfiles.sh +++ b/.install/hyprland-dotfiles.sh @@ -8,8 +8,10 @@ fi if [ -d ~/dotfiles-versions/$version/vim ]; then _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config fi -if [ -d ~/dotfiles-versions/$version/nvim ]; then - _installSymLink nvim ~/.config/nvim ~/dotfiles/nvim/ ~/.config +if [ $neovim == "1" ] ;then + if [ -d ~/dotfiles-versions/$version/nvim ]; then + _installSymLink nvim ~/.config/nvim ~/dotfiles/nvim/ ~/.config + fi fi if [ -d ~/dotfiles-versions/$version/starship ]; then _installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml diff --git a/.install/neovim.sh b/.install/neovim.sh new file mode 100644 index 0000000..9e78bd8 --- /dev/null +++ b/.install/neovim.sh @@ -0,0 +1,16 @@ +# ------------------------------------------------------ +# Neovim +# ------------------------------------------------------ +neovim=0 +if [ -d ~/dotfiles/nvim ]; then +echo -e "${GREEN}" +figlet "Neovim" +echo -e "${NONE}" + if gum confirm "Do you want to install the ML4W Neovim configuration and overwrite your existing configuration?"; then + echo ":: ML4W Neovim configuration will be installed" + neovim=1 + else + rm -rf ~/dotfiles-versions/$version/nvim/ + echo ":: Installation of ML4W Neovim configuration skipped." + fi +fi diff --git a/.install/reboot.sh b/.install/reboot.sh new file mode 100644 index 0000000..9e1f6b3 --- /dev/null +++ b/.install/reboot.sh @@ -0,0 +1,17 @@ +# ------------------------------------------------------ +# Reboot +# ------------------------------------------------------ + +echo -e "${GREEN}" +figlet "Done" +echo -e "${NONE}" +if gum confirm "Do you want to reboot your system now?" ;then + echo ":: Rebooting now ..." + sleep 3 + systemctl reboot +elif [ $? -eq 130 ]; then + exit 130 +else + echo ":: Reboot skipped" +fi +echo "" diff --git a/.version/version b/.version/version index 2a9d55f..ab991e6 100644 --- a/.version/version +++ b/.version/version @@ -1 +1 @@ -2831 \ No newline at end of file +2832 \ No newline at end of file diff --git a/apps/ML4W_Dotfiles_Settings-x86_64.AppImage b/apps/ML4W_Dotfiles_Settings-x86_64.AppImage index 6f51a66..1f2ab24 100755 Binary files a/apps/ML4W_Dotfiles_Settings-x86_64.AppImage and b/apps/ML4W_Dotfiles_Settings-x86_64.AppImage differ diff --git a/install.sh b/install.sh index 08a7e40..102f6e7 100755 --- a/install.sh +++ b/install.sh @@ -64,6 +64,7 @@ source .install/displaymanager.sh source .install/issue.sh source .install/restore.sh source .install/keyboard.sh +source .install/neovim.sh source .install/vm.sh source .install/hook.sh source .install/copy.sh @@ -79,10 +80,5 @@ source .install/apps.sh source .install/gtk.sh source .install/bashrc.sh source .install/cleanup.sh - -echo -e "${GREEN}" -figlet "Done" -echo -e "${NONE}" -echo "Please reboot your system!" -echo +source .install/reboot.sh sleep 3