Commit 88963b0bbb40c99b5670bfda7ba7775b107ecbc1

Authored by mj
1 parent e5c710d8b4
Exists in master and in 2 other branches 02-merge, dev

*/zshrc.sh:

- REMOVE obsolete parts
- MOVE git plugin FROM dotfiles/zshrc.sh TO templates/zshrc.sh

Showing 2 changed files with 4 additions and 16 deletions Inline Diff

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 git 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 # export MANPATH="/usr/local/man:$MANPATH"
37 36
38 # Environment 37 # Environment
39 if [ -f $ZCFG/dotfiles/environment.sh ]; then 38 if [ -f $ZCFG/dotfiles/environment.sh ]; then
40 . $ZCFG/dotfiles/environment.sh 39 . $ZCFG/dotfiles/environment.sh
41 fi 40 fi
42 41
43 # History 42 # History
44 export HISTFILESIZE= 43 export HISTFILESIZE=
45 export HISTSIZE= 44 export HISTSIZE=
46 export HISTFILE=~/.history 45 export HISTFILE=~/.history
47 46
48 # Apply 47 # Apply
49 source $ZSH/oh-my-zsh.sh 48 source $ZSH/oh-my-zsh.sh
50 49
51 # Aliases 50 # Aliases
52 if [ -f $ZCFG/templates/bash_aliases.sh ]; then 51 if [ -f $ZCFG/templates/bash_aliases.sh ]; then
53 . $ZCFG/templates/bash_aliases.sh 52 . $ZCFG/templates/bash_aliases.sh
54 fi 53 fi
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 # export MANPATH="/usr/local/man:$MANPATH"
14
15 # if [ "1" == "2" ]; then
16 # #sudo apt-get -yq python-setuptools
17 #
18 # #sudo easy_install pip
19 # #sudo pip install virtualenvwrapper
20 #
21 # mkvirtualenv cb-meteor
22 # pip install nodeenv
23 # nodeenv -p
24 #
25 # # curl https://install.meteor.com/ | sh
26 # fi
27 13
28 plugins=( 14 plugins=(
15 git
16 # ---
29 # meteor 17 # meteor
30 # node npm 18 # node npm
19 # docker
31 ) 20 )
32 21
33 # Main .zshrc 22 # Main .zshrc