mj / zsh-config

Download as
Browse Code ยป

Commit 80a402555591ac0ed9947ee76b09c115a7e82902

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

[IMP] AUTO-ADD screen

Showing 2 changed files with 2 additions and 2 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 history history-substring-search 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 source /usr/local/bin/virtualenvwrapper.sh 46 source /usr/local/bin/virtualenvwrapper.sh
47 plugins+=(pip python virtualenv virtualenvwrapper) 47 plugins+=(pip python virtualenv virtualenvwrapper)
48 fi 48 fi
49 49
50 # Aliases 50 # Aliases
51 alias zpl='cd $ZSH/plugins && ls -Alh | less' 51 alias zpl='cd $ZSH/plugins && ls -Alh | less'
52 alias zup='cd $ZCFG && git pull origin master && source ~/.zshrc && cd' 52 alias zup='cd $ZCFG && git pull origin master && source ~/.zshrc && cd'
53 53
54 if [ -f $ZCFG/dotfiles/bash_aliases.sh ]; then 54 if [ -f $ZCFG/dotfiles/bash_aliases.sh ]; then
55 . $ZCFG/dotfiles/bash_aliases.sh 55 . $ZCFG/dotfiles/bash_aliases.sh
56 fi 56 fi
1 #@IgnoreInspection AddShebang 1 #@IgnoreInspection AddShebang
2 # 2 #
3 # ** Initiate with: ** 3 # ** Initiate with: **
4 # cd && curl -L http://git.str8.biz/mj/zsh-config/raw/master/tools/install.sh | sh 4 # cd && curl -L http://git.str8.biz/mj/zsh-config/raw/master/tools/install.sh | sh
5 # 5 #
6 # --------------------------------------------------------------------------------------------- 6 # ---------------------------------------------------------------------------------------------
7 # 7 #
8 # gj@ubuntu4docker:~$ touch install.sh 8 # gj@ubuntu4docker:~$ touch install.sh
9 # gj@ubuntu4docker:~$ rm install.sh && nano install.sh && chmod +x install.sh && ./install.sh 9 # gj@ubuntu4docker:~$ rm install.sh && nano install.sh && chmod +x install.sh && ./install.sh
10 # 10 #
11 ################################################################################################ 11 ################################################################################################
12 12
13 set -e 13 set -e
14 14
15 if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ] && [ ! $DONTINSTALL ]; then 15 if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ] && [ ! $DONTINSTALL ]; then
16 apt-get -yq install curl dialog git nano zsh 16 apt-get -yq install curl dialog git nano screen zsh
17 else 17 else
18 if [ "$UID" != "0" ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi 18 if [ "$UID" != "0" ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi
19 19
20 if [ "$SHELL" != "$(which zsh)" ]; then 20 if [ "$SHELL" != "$(which zsh)" ]; then
21 echo "$(which zsh)" 21 echo "$(which zsh)"
22 $CMD_PREFIX echo "enter pass...." 22 $CMD_PREFIX echo "enter pass...."
23 23
24 echo "ok" 24 echo "ok"
25 25
26 $CMD_PREFIX apt-get -yq install curl dialog git nano zsh 26 $CMD_PREFIX apt-get -yq install curl dialog git nano zsh
27 fi 27 fi
28 fi 28 fi
29 29
30 if [ ! -n "$HOME" ]; then 30 if [ ! -n "$HOME" ]; then
31 HOME=~/ 31 HOME=~/
32 fi 32 fi
33 33
34 if [ ! -n "$ZCNF" ]; then 34 if [ ! -n "$ZCNF" ]; then
35 ZCNF=$HOME/.config/zsh-config 35 ZCNF=$HOME/.config/zsh-config
36 fi 36 fi
37 37
38 if [ ! -n "$ZSH" ]; then 38 if [ ! -n "$ZSH" ]; then
39 ZSH=$ZCNF/packages/oh-my-zsh 39 ZSH=$ZCNF/packages/oh-my-zsh
40 fi 40 fi
41 41
42 echo "\033[0;34mCleaning...\033[0m" 42 echo "\033[0;34mCleaning...\033[0m"
43 if [ -d ~/.config/zsh-config ] || [ -h ~/.config/zsh-config ]; then 43 if [ -d ~/.config/zsh-config ] || [ -h ~/.config/zsh-config ]; then
44 rm -rf ~/.config/zsh-config 44 rm -rf ~/.config/zsh-config
45 fi 45 fi
46 46
47 if [ -d ~/.config/oh-my-zsh ] || [ -h ~/.config/oh-my-zsh ]; then 47 if [ -d ~/.config/oh-my-zsh ] || [ -h ~/.config/oh-my-zsh ]; then
48 rm -rf ~/.config/oh-my-zsh 48 rm -rf ~/.config/oh-my-zsh
49 fi 49 fi
50 50
51 if [ -d ~/.config/antigen ] || [ -h ~/.config/antigen ]; then 51 if [ -d ~/.config/antigen ] || [ -h ~/.config/antigen ]; then
52 rm -rf ~/.config/antigen 52 rm -rf ~/.config/antigen
53 fi 53 fi
54 54
55 if [ -d ~/.oh-my-zsh ] || [ -h ~/.oh-my-zsh ]; then 55 if [ -d ~/.oh-my-zsh ] || [ -h ~/.oh-my-zsh ]; then
56 rm -rf ~/.oh-my-zsh 56 rm -rf ~/.oh-my-zsh
57 fi 57 fi
58 58
59 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then 59 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
60 mv ~/.zshrc ~/.zshrc.pre-zsh-cnf 60 mv ~/.zshrc ~/.zshrc.pre-zsh-cnf
61 fi 61 fi
62 62
63 # 63 #
64 # BASH: 64 # BASH:
65 # 65 #
66 if [ -f ~/.bashrc ] || [ -h ~/.bashrc ]; then 66 if [ -f ~/.bashrc ] || [ -h ~/.bashrc ]; then
67 mv ~/.bashrc ~/.bashrc.pre-zsh-cnf 67 mv ~/.bashrc ~/.bashrc.pre-zsh-cnf
68 fi 68 fi
69 if [ -f ~/.bash_aliases ] || [ -h ~/.bash_aliases ]; then 69 if [ -f ~/.bash_aliases ] || [ -h ~/.bash_aliases ]; then
70 rm ~/.bash_aliases 70 rm ~/.bash_aliases
71 fi 71 fi
72 72
73 echo "\033[0;34mCloning Zsh Config...\033[0m" 73 echo "\033[0;34mCloning Zsh Config...\033[0m"
74 hash git >/dev/null 2>&1 && env git clone --depth=1 http://git.str8.biz/mj/zsh-config.git $ZCNF || { 74 hash git >/dev/null 2>&1 && env git clone --depth=1 http://git.str8.biz/mj/zsh-config.git $ZCNF || {
75 echo "can't clone repo.." 75 echo "can't clone repo.."
76 exit 1 76 exit 1
77 } 77 }
78 78
79 echo "\033[0;34mUsing the Zsh Config template file and adding it to ~/.zshrc\033[0m" 79 echo "\033[0;34mUsing the Zsh Config template file and adding it to ~/.zshrc\033[0m"
80 cp $ZCNF/templates/zshrc.sh ~/.zshrc 80 cp $ZCNF/templates/zshrc.sh ~/.zshrc
81 cp $ZCNF/templates/bashrc.sh ~/.bashrc 81 cp $ZCNF/templates/bashrc.sh ~/.bashrc
82 82
83 #sed -i -e "/^export ZSH=/ c\\ 83 #sed -i -e "/^export ZSH=/ c\\
84 #export ZSH=$ZSH 84 #export ZSH=$ZSH
85 #" ~/.zshrc 85 #" ~/.zshrc
86 86
87 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m" 87 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
88 sed -i -e "/export PATH=/ c\\ 88 sed -i -e "/export PATH=/ c\\
89 export PATH=\"$PATH\" 89 export PATH=\"$PATH\"
90 " ~/.zshrc 90 " ~/.zshrc
91 91
92 if [ "$SHELL" != "$(which zsh)" ]; then 92 if [ "$SHELL" != "$(which zsh)" ]; then
93 echo "\033[0;34mTime to change your default shell to zsh!\033[0m" 93 echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
94 # echo "chsh -s $(which zsh)" 94 # echo "chsh -s $(which zsh)"
95 echo "chsh -s /bin/zsh" 95 echo "chsh -s /bin/zsh"
96 fi 96 fi
97 97
98 echo "\033[0;32m"' __ __ '"\033[0m" 98 echo "\033[0;32m"' __ __ '"\033[0m"
99 echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m" 99 echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m"
100 echo "\033[0;32m"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"\033[0m" 100 echo "\033[0;32m"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"\033[0m"
101 echo "\033[0;32m"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"\033[0m" 101 echo "\033[0;32m"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"\033[0m"
102 echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m" 102 echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m"
103 echo "\033[0;32m"' /____/ ....is now installed!'"\033[0m" 103 echo "\033[0;32m"' /____/ ....is now installed!'"\033[0m"
104 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m" 104 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
105 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m" 105 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
106 echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m" 106 echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m"
107 #env zsh 107 #env zsh
108 #. ~/.zshrc 108 #. ~/.zshrc
109 109