diff --git a/README.md b/README.md index 9081e99..b68b701 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,24 @@ sdk install java 8.0.202-zulu ### Install dependencies (apps, fonts, ...) with Brew `brew bundle` -### Install Oh My Zsh +### Install Oh My Zsh and some cool dependencies ``` sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" git clone https://github.com/bhilburn/powerlevel9k.git ~/.oh-my-zsh/custom/themes/powerlevel9 git clone https://github.com/AlexisBRENON/oh-my-zsh-reminder ~/.oh-my-zsh/custom/plugins/reminder +git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting +git clone https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions +``` +#### In order to upgrade it, just run +`upgrade_oh_my_zsh` + +### In cases of `\n` irrors with zsh +https://github.com/robbyrussell/oh-my-zsh/issues/6764#issuecomment-384045008 +``` +cd $ZSH +git config core.autocrlf false +git rm --cached -r . +git reset --hard ``` ### OSX Defaults diff --git a/dot_zsh_aliases b/dot_zsh_aliases index 135aae4..4e2cd21 100644 --- a/dot_zsh_aliases +++ b/dot_zsh_aliases @@ -36,7 +36,7 @@ alias mailperso="gmail2" alias mailpro="gmail" # To do / Done -alias done='task_done' +#alias done='task_done' # Management / Security / SSH / SSL alias mgmt='ssh $(whoami)@management.collibra.com -i ~/.ssh/id_rsa' diff --git a/dot_zshrc b/dot_zshrc index bd1b9ae..5a141ab 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -9,7 +9,7 @@ export ZSH="/Users/morganwattiez/.oh-my-zsh" # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes ZSH_THEME="powerlevel9k/powerlevel9k" - +ZSH_COLORIZE_STYLE="monokai" # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load # a theme from this variable instead of looking in ~/.oh-my-zsh/themes/ @@ -62,7 +62,7 @@ ZSH_THEME="powerlevel9k/powerlevel9k" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(reminder git) +plugins=(reminder git sdk zsh-syntax-highlighting zsh-autosuggestions ansible brew colorize docker pipenv pip python terraform aws) source $ZSH/oh-my-zsh.sh @@ -99,10 +99,11 @@ unlink "$HOME/Library/Application Support/Code/User/settings.json" ln -s "$HOME/.config/Code/User/settings.json" "$HOME/Library/Application Support/Code/User/settings.json" #cm apply +sh ~/.scripts/resume.sh + #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! https://github.com/sdkman/sdkman-cli/issues/613 export SDKMAN_DIR="$HOME/.sdkman" -[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" +[[ -s "$SDKMAN_DIR/bin/sdkman-init.sh" ]] && source "$SDKMAN_DIR/bin/sdkman-init.sh" + sdk use java 8.0.202-zulu export PATH=$PATH:/usr/local/Cellar/python/3.7.3/Frameworks/Python.framework/Versions/3.7/bin/ - -sh ~/.scripts/resume.sh