Commit d1ed76128c7736d91134f556ae077c6fe56e423f

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

[IMP] export ZSH

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