Commit 9e08f2376c8e5919a2342edf13102a2c593948b6
1 parent
e25a750ad7
Exists in
master
and in
2 other branches
[IMP] zshrc.sh: DON'T export PATH
Showing 2 changed files with 9 additions and 9 deletions Inline Diff
dotfiles/zshrc.sh
| 1 | #@IgnoreInspection AddShebang | 1 | #@IgnoreInspection AddShebang |
| 2 | # ENVIRONMENT: | 2 | # ENVIRONMENT: |
| 3 | export GJ_ENV=local_aptproxy | 3 | export GJ_ENV=local_aptproxy |
| 4 | 4 | ||
| 5 | # Path to your oh-my-zsh installation. | 5 | # Path to your oh-my-zsh installation. |
| 6 | export ZSH=$ZCFG/packages/oh-my-zsh | 6 | export ZSH=$ZCFG/packages/oh-my-zsh |
| 7 | 7 | ||
| 8 | export LANG=en_US.UTF-8 | 8 | export LANG=en_US.UTF-8 |
| 9 | 9 | ||
| 10 | # Compilation flags | 10 | # Compilation flags |
| 11 | export ARCHFLAGS="-arch x86_64" | 11 | export ARCHFLAGS="-arch x86_64" |
| 12 | 12 | ||
| 13 | # Themes are in (...)/oh-my-zsh/themes/ or "random" | 13 | # Themes are in (...)/oh-my-zsh/themes/ or "random" |
| 14 | ZSH_THEME="mj" | 14 | ZSH_THEME="mj" |
| 15 | 15 | ||
| 16 | CASE_SENSITIVE="true" | 16 | CASE_SENSITIVE="true" |
| 17 | DISABLE_AUTO_UPDATE="true" | 17 | DISABLE_AUTO_UPDATE="true" |
| 18 | #DISABLE_AUTO_TITLE="true" | 18 | #DISABLE_AUTO_TITLE="true" |
| 19 | ENABLE_CORRECTION="false" | 19 | ENABLE_CORRECTION="false" |
| 20 | COMPLETION_WAITING_DOTS="true" | 20 | COMPLETION_WAITING_DOTS="true" |
| 21 | DISABLE_UNTRACKED_FILES_DIRTY="true" | 21 | DISABLE_UNTRACKED_FILES_DIRTY="true" |
| 22 | HIST_STAMPS="dd.mm.yyyy" | 22 | HIST_STAMPS="dd.mm.yyyy" |
| 23 | ZSH_CUSTOM=$ZCFG/custom | 23 | ZSH_CUSTOM=$ZCFG/custom |
| 24 | 24 | ||
| 25 | plugins+=(command-not-found common-aliases debian dirhistory history history-substring-search screen systemadmin zsh_reload) | 25 | plugins+=(command-not-found common-aliases debian dirhistory history history-substring-search screen systemadmin zsh_reload) |
| 26 | 26 | ||
| 27 | # User configuration | 27 | # User configuration |
| 28 | export PATH=$HOME/bin:/usr/local/bin:$PATH | 28 | #export PATH=$HOME/bin:/usr/local/bin:$PATH |
| 29 | 29 | ||
| 30 | # Environment | 30 | # Environment |
| 31 | if [ -f $ZCFG/dotfiles/environment.sh ]; then | 31 | if [ -f $ZCFG/dotfiles/environment.sh ]; then |
| 32 | . $ZCFG/dotfiles/environment.sh | 32 | . $ZCFG/dotfiles/environment.sh |
| 33 | fi | 33 | fi |
| 34 | 34 | ||
| 35 | # History | 35 | # History |
| 36 | export HISTFILESIZE= | 36 | export HISTFILESIZE= |
| 37 | export HISTSIZE= | 37 | export HISTSIZE= |
| 38 | export HISTFILE=~/.history | 38 | export HISTFILE=~/.history |
| 39 | 39 | ||
| 40 | # Apply | 40 | # Apply |
| 41 | source $ZSH/oh-my-zsh.sh | 41 | source $ZSH/oh-my-zsh.sh |
| 42 | 42 | ||
| 43 | # virtualenvwrapper | 43 | # virtualenvwrapper |
| 44 | if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then | 44 | if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then |
| 45 | export WORKON_HOME=$HOME/.virtualenvs | 45 | export WORKON_HOME=$HOME/.virtualenvs |
| 46 | export VIRTUALENVWRAPPER_HOOK_DIR=$HOME/.virtualenvs | 46 | export VIRTUALENVWRAPPER_HOOK_DIR=$HOME/.virtualenvs |
| 47 | source /usr/local/bin/virtualenvwrapper.sh | 47 | source /usr/local/bin/virtualenvwrapper.sh |
| 48 | plugins+=(pip python virtualenv virtualenvwrapper) | 48 | plugins+=(pip python virtualenv virtualenvwrapper) |
| 49 | fi | 49 | fi |
| 50 | 50 | ||
| 51 | # Aliases | 51 | # Aliases |
| 52 | alias zpl='cd $ZSH/plugins && ls -Alh | less' | 52 | alias zpl='cd $ZSH/plugins && ls -Alh | less' |
| 53 | alias zup='cd $ZCFG && git pull origin master && rm ~/.zcompdump* && source ~/.zshrc && cd' | 53 | alias zup='cd $ZCFG && git pull origin master && rm ~/.zcompdump* && source ~/.zshrc && cd' |
| 54 | alias zupdev='cd $ZCFG && git pull origin dev && rm ~/.zcompdump* && source ~/.zshrc && cd' | 54 | alias zupdev='cd $ZCFG && git pull origin dev && rm ~/.zcompdump* && source ~/.zshrc && cd' |
| 55 | 55 | ||
| 56 | if [ -f $ZCFG/dotfiles/bash_aliases.sh ]; then | 56 | if [ -f $ZCFG/dotfiles/bash_aliases.sh ]; then |
| 57 | . $ZCFG/dotfiles/bash_aliases.sh | 57 | . $ZCFG/dotfiles/bash_aliases.sh |
| 58 | fi | 58 | fi |
| 59 | 59 | ||
| 60 | if [ -f $ZCFG/dotfiles/aliases_zsh.sh ]; then | 60 | if [ -f $ZCFG/dotfiles/aliases_zsh.sh ]; then |
| 61 | . $ZCFG/dotfiles/aliases_zsh.sh | 61 | . $ZCFG/dotfiles/aliases_zsh.sh |
| 62 | fi | ||
| 62 | fi |
templates/zshrc.sh
| 1 | #@IgnoreInspection AddShebang | 1 | #@IgnoreInspection AddShebang |
| 2 | 2 | ||
| 3 | export ZCFG=$HOME/.config/zsh-config | 3 | export ZCFG=$HOME/.config/zsh-config |
| 4 | export ZCFG_SPLIT=1 | 4 | export ZCFG_SPLIT=1 |
| 5 | 5 | ||
| 6 | # Environment | 6 | # Environment |
| 7 | export GJ_ENV=local_aptproxy | 7 | export GJ_ENV=local_aptproxy |
| 8 | export LANG=en_US.UTF-8 | 8 | export LANG=en_US.UTF-8 |
| 9 | export ARCHFLAGS="-arch x86_64" | 9 | export ARCHFLAGS="-arch x86_64" |
| 10 | 10 | ||
| 11 | # User configuration | 11 | # User configuration |
| 12 | export PATH=$HOME/bin:/usr/local/bin:$PATH | 12 | #export PATH=$HOME/bin:/usr/local/bin:$PATH |
| 13 | 13 | ||
| 14 | plugins=( | 14 | plugins=( |
| 15 | git | 15 | git |
| 16 | # --- | 16 | # --- |
| 17 | # meteor | 17 | # meteor |
| 18 | # node npm | 18 | # node npm |
| 19 | # docker | 19 | # docker |
| 20 | ) | 20 | ) |
| 21 | 21 | ||
| 22 | # Main .zshrc | 22 | # Main .zshrc |
| 23 | if [ -f $ZCFG/dotfiles/zshrc.sh ]; then | 23 | if [ -f $ZCFG/dotfiles/zshrc.sh ]; then |
| 24 | . $ZCFG/dotfiles/zshrc.sh | 24 | . $ZCFG/dotfiles/zshrc.sh |
| 25 | fi | ||
| 25 | fi |