diff --git a/CHANGELOGS.md b/CHANGELOGS.md index d6ccc96..b0968b7 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,9 @@ ## Changelogs +## 11 Dec 2023 +- Changing over to zsh automatically if user opted +- If chose to install zsh and have no login manager, zsh auto login will auto start Hyprland + ## 03 Dec 2023 - Added kvantum for qt apps theming - return of wlogout due to theming issues of rofi-power diff --git a/README.md b/README.md index b2b302b..c532d35 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ chmod +x install.sh ./install.sh ``` ### ✨ for ZSH and OH-MY-ZSH installation -> do this once installed and script completed; do the following to change the default shell zsh +> installer should auto change your default shell to zsh. However, if it does not, do this ```bash chsh -s $(which zsh) zsh @@ -78,7 +78,7 @@ source ~/.zshrc - Head over to wiki Link [`WIKI`](🏴https://github.com/JaKooLit/Hyprland-Dots/wiki) ### 🛣️ Roadmap: -- [ ] Install zsh and oh-my-zsh without necessary steps above +- ~~[ ] Install zsh and oh-my-zsh without necessary steps above~~ DONE - [ ] possibly adding gruvbox themes, cursors, icons ### ⚠️ some known issues diff --git a/assets/.zprofile b/assets/.zprofile new file mode 100644 index 0000000..d0161af --- /dev/null +++ b/assets/.zprofile @@ -0,0 +1,3 @@ +if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then + Hyprland +fi diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index 10f8d66..e7c7c66 100644 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -15,6 +15,17 @@ RESET=$(tput sgr0) # Set the name of the log file to include the current date and time LOG="install-$(date +%d-%H%M%S)_zsh.log" + +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + +# Determine the directory where the script is located +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +# Change the working directory to the parent directory of the script +PARENT_DIR="$SCRIPT_DIR/.." +cd "$PARENT_DIR" || exit 1 + + ISAUR=$(command -v yay || command -v paru) # Set the script to exit on error @@ -61,6 +72,10 @@ if [[ $zsh =~ ^[Yy]$ ]]; then git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions && \ git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting && \ cp -r 'assets/.zshrc' ~/ + cp -r 'assets/.zprofile' ~/ + + printf "${NOTE} changing default shell to zsh.....\n" + chsh -s $(which zsh) else printf "${NOTE} ZSH wont be installed.\n" fi