diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc index 9a3c19ae3fe..401e79aac8d 100644 --- a/runcoms/zpreztorc +++ b/runcoms/zpreztorc @@ -3,6 +3,7 @@ # # Authors: # Sorin Ionescu +# Toine Hartman # # @@ -10,7 +11,7 @@ # # Set case-sensitivity for completion, history lookup, etc. -# zstyle ':prezto:*:*' case-sensitive 'yes' +zstyle ':prezto:*:*' case-sensitive 'yes' # Color output (auto set to 'no' on dumb terminals). zstyle ':prezto:*:*' color 'yes' @@ -32,13 +33,17 @@ zstyle ':prezto:*:*' color 'yes' zstyle ':prezto:load' pmodule \ 'environment' \ 'terminal' \ - 'editor' \ 'history' \ 'directory' \ - 'spectrum' \ 'utility' \ - 'completion' \ - 'prompt' + 'prompt' \ + 'syntax-highlighting' \ + 'history-substring-search' \ + 'autosuggestions' \ + 'archive' \ + 'rsync' \ + 'git' \ + 'completion' # # Autosuggestions @@ -60,7 +65,7 @@ zstyle ':prezto:load' pmodule \ # # Set the key mapping style to 'emacs' or 'vi'. -zstyle ':prezto:module:editor' key-bindings 'emacs' +zstyle ':prezto:module:editor' key-bindings 'vi' # Auto convert .... to ../.. # zstyle ':prezto:module:editor' dot-expansion 'yes' @@ -116,7 +121,7 @@ zstyle ':prezto:module:editor' key-bindings 'emacs' # Set the prompt theme to load. # Setting it to 'random' loads a random theme. # Auto set to 'off' on dumb terminals. -zstyle ':prezto:module:prompt' theme 'sorin' +zstyle ':prezto:module:prompt' theme 'pure' # Set the working directory prompt display length. # By default, it is set to 'short'. Set it to 'long' (without '~' expansion) @@ -136,13 +141,13 @@ zstyle ':prezto:module:prompt' theme 'sorin' # Automatically initialize virtualenvwrapper if pre-requisites are met. # zstyle ':prezto:module:python:virtualenv' initialize 'yes' - +zstyle ':prezto:module:python' conda-init 'on' # # Ruby # # Auto switch the Ruby version on directory change. -# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes' +zstyle ':prezto:module:ruby:chruby' auto-switch 'yes' # # Screen @@ -159,7 +164,7 @@ zstyle ':prezto:module:prompt' theme 'sorin' # # Set the SSH identities to load into the agent. -# zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_rsa2' 'id_github' +zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_rsa2' 'id_github' # # Syntax Highlighting @@ -167,13 +172,13 @@ zstyle ':prezto:module:prompt' theme 'sorin' # Set syntax highlighters. # By default, only the main highlighter is enabled. -# zstyle ':prezto:module:syntax-highlighting' highlighters \ -# 'main' \ -# 'brackets' \ -# 'pattern' \ -# 'line' \ -# 'cursor' \ -# 'root' +zstyle ':prezto:module:syntax-highlighting' highlighters \ + 'main' \ + 'brackets' \ + 'pattern' \ + 'line' \ + 'cursor' \ + 'root' # # Set syntax highlighting styles. # zstyle ':prezto:module:syntax-highlighting' styles \ @@ -190,7 +195,7 @@ zstyle ':prezto:module:prompt' theme 'sorin' # # Auto set the tab and window titles. -# zstyle ':prezto:module:terminal' auto-title 'yes' +zstyle ':prezto:module:terminal' auto-title 'yes' # Set the window title format. # zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s' diff --git a/runcoms/zshrc b/runcoms/zshrc index 039b882d880..f2fe10c08b2 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -11,3 +11,23 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then fi # Customize to your needs... +source $HOME/.alias +source $HOME/.profile + +setopt NO_NOMATCH + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +__conda_setup="$('/usr/local/Caskroom/miniconda/4.6.14/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" +if [ $? -eq 0 ]; then + eval "$__conda_setup" +else + if [ -f "/usr/local/Caskroom/miniconda/4.6.14/miniconda3/etc/profile.d/conda.sh" ]; then + . "/usr/local/Caskroom/miniconda/4.6.14/miniconda3/etc/profile.d/conda.sh" + else + export PATH="/usr/local/Caskroom/miniconda/4.6.14/miniconda3/bin:$PATH" + fi +fi +unset __conda_setup +# <<< conda initialize <<< +