Commit e2acb86d94820c69f463ab34449bffe84c2c0f4c
1 parent
576d53c329
Exists in
master
and in
2 other branches
dotfiles/zshrc.sh:
include right bash_aliases.sh
Showing 1 changed file with 2 additions and 2 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 systemadmin zsh_reload) | 25 | plugins+=(command-not-found common-aliases debian dirhistory history history-substring-search systemadmin zsh_reload) |
| 26 | 26 | ||
| 27 | # virtualenvwrapper | 27 | # virtualenvwrapper |
| 28 | if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then | 28 | if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then |
| 29 | export WORKON_HOME=$HOME/.virtualenvs | 29 | export WORKON_HOME=$HOME/.virtualenvs |
| 30 | source /usr/local/bin/virtualenvwrapper.sh | 30 | source /usr/local/bin/virtualenvwrapper.sh |
| 31 | plugins+=(pip python virtualenv virtualenvwrapper) | 31 | plugins+=(pip python virtualenv virtualenvwrapper) |
| 32 | fi | 32 | fi |
| 33 | 33 | ||
| 34 | # User configuration | 34 | # User configuration |
| 35 | export PATH=$HOME/bin:/usr/local/bin:$PATH | 35 | export PATH=$HOME/bin:/usr/local/bin:$PATH |
| 36 | 36 | ||
| 37 | # Environment | 37 | # Environment |
| 38 | if [ -f $ZCFG/dotfiles/environment.sh ]; then | 38 | if [ -f $ZCFG/dotfiles/environment.sh ]; then |
| 39 | . $ZCFG/dotfiles/environment.sh | 39 | . $ZCFG/dotfiles/environment.sh |
| 40 | fi | 40 | fi |
| 41 | 41 | ||
| 42 | # History | 42 | # History |
| 43 | export HISTFILESIZE= | 43 | export HISTFILESIZE= |
| 44 | export HISTSIZE= | 44 | export HISTSIZE= |
| 45 | export HISTFILE=~/.history | 45 | export HISTFILE=~/.history |
| 46 | 46 | ||
| 47 | # Apply | 47 | # Apply |
| 48 | source $ZSH/oh-my-zsh.sh | 48 | source $ZSH/oh-my-zsh.sh |
| 49 | 49 | ||
| 50 | # Aliases | 50 | # Aliases |
| 51 | if [ -f $ZCFG/templates/bash_aliases.sh ]; then | 51 | if [ -f $ZCFG/dotfiles/bash_aliases.sh ]; then |
| 52 | . $ZCFG/templates/bash_aliases.sh | 52 | . $ZCFG/dotfiles/bash_aliases.sh |
| 53 | fi | 53 | fi |