Commit 1e57f178b0ea0fe27ff449c0cecca7c23399f432
1 parent
c73235dd21
Exists in
master
and in
2 other branches
.zshrc.sh: FIX
Showing 2 changed files with 6 additions and 6 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 | export ZCFG=$HOME/.config/zsh-config | ||
6 | # Path to your oh-my-zsh installation. | 5 | # Path to your oh-my-zsh installation. |
7 | export ZSH=$ZCFG/packages/oh-my-zsh | 6 | export ZSH=$ZCFG/packages/oh-my-zsh |
8 | 7 | ||
9 | export LANG=en_US.UTF-8 | 8 | export LANG=en_US.UTF-8 |
10 | 9 | ||
11 | # Compilation flags | 10 | # Compilation flags |
12 | export ARCHFLAGS="-arch x86_64" | 11 | export ARCHFLAGS="-arch x86_64" |
13 | 12 | ||
14 | # Themes are in (...)/oh-my-zsh/themes/ or "random" | 13 | # Themes are in (...)/oh-my-zsh/themes/ or "random" |
15 | ZSH_THEME="mj" | 14 | ZSH_THEME="mj" |
16 | 15 | ||
17 | CASE_SENSITIVE="true" | 16 | CASE_SENSITIVE="true" |
18 | DISABLE_AUTO_UPDATE="true" | 17 | DISABLE_AUTO_UPDATE="true" |
19 | #DISABLE_AUTO_TITLE="true" | 18 | #DISABLE_AUTO_TITLE="true" |
20 | ENABLE_CORRECTION="false" | 19 | ENABLE_CORRECTION="false" |
21 | COMPLETION_WAITING_DOTS="true" | 20 | COMPLETION_WAITING_DOTS="true" |
22 | DISABLE_UNTRACKED_FILES_DIRTY="true" | 21 | DISABLE_UNTRACKED_FILES_DIRTY="true" |
23 | HIST_STAMPS="dd.mm.yyyy" | 22 | HIST_STAMPS="dd.mm.yyyy" |
24 | ZSH_CUSTOM=ZCFG/custom | 23 | ZSH_CUSTOM=ZCFG/custom |
25 | 24 | ||
26 | 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 git history history-substring-search systemadmin zsh_reload) |
27 | 26 | ||
28 | # User configuration | 27 | # User configuration |
29 | export PATH=$HOME/bin:/usr/local/bin:$PATH | 28 | export PATH=$HOME/bin:/usr/local/bin:$PATH |
30 | # export MANPATH="/usr/local/man:$MANPATH" | 29 | # export MANPATH="/usr/local/man:$MANPATH" |
31 | 30 | ||
32 | # Environment | 31 | # Environment |
33 | if [ -f $ZCFG/dotfiles/environment.sh ]; then | 32 | if [ -f $ZCFG/dotfiles/environment.sh ]; then |
34 | . $ZCFG/dotfiles/environment.sh | 33 | . $ZCFG/dotfiles/environment.sh |
35 | fi | 34 | fi |
36 | 35 | ||
36 | # History | ||
37 | export HISTFILESIZE= | 37 | export HISTFILESIZE= |
38 | export HISTSIZE= | 38 | export HISTSIZE= |
39 | export HISTFILE=~/.history | 39 | export HISTFILE=~/.history |
40 | 40 | ||
41 | #source $ZSH/oh-my-zsh.sh | 41 | # Apply |
42 | source $HOME/.config/zsh-config/packages/oh-my-zsh/oh-my-zsh.sh | 42 | source $ZSH/oh-my-zsh.sh |
43 | |||
44 | export ZSH=$ZCFG/packages/oh-my-zsh | ||
45 | 43 | ||
46 | # Aliases | 44 | # Aliases |
47 | if [ -f $ZCFG/templates/bash_aliases.sh ]; then | 45 | if [ -f $ZCFG/templates/bash_aliases.sh ]; then |
48 | . $ZCFG/templates/bash_aliases.sh | 46 | . $ZCFG/templates/bash_aliases.sh |
49 | fi | 47 | fi |
templates/zshrc.sh
1 | #@IgnoreInspection AddShebang | 1 | #@IgnoreInspection AddShebang |
2 | 2 | ||
3 | export ZCFG=$HOME/.config/zsh-config | ||
4 | |||
3 | # ENVIRONMENT: | 5 | # ENVIRONMENT: |
4 | export GJ_ENV=local_aptproxy | 6 | export GJ_ENV=local_aptproxy |
5 | 7 | ||
6 | export LANG=en_US.UTF-8 | 8 | export LANG=en_US.UTF-8 |
7 | 9 | ||
8 | # Compilation flags | 10 | # Compilation flags |
9 | export ARCHFLAGS="-arch x86_64" | 11 | export ARCHFLAGS="-arch x86_64" |
10 | 12 | ||
11 | # User configuration | 13 | # User configuration |
12 | export PATH=$HOME/bin:/usr/local/bin:$PATH | 14 | export PATH=$HOME/bin:/usr/local/bin:$PATH |
13 | # export MANPATH="/usr/local/man:$MANPATH" | 15 | # export MANPATH="/usr/local/man:$MANPATH" |
14 | 16 | ||
15 | plugins=( | 17 | plugins=( |
16 | pip python virtualenv virtualenvwrapper | 18 | pip python virtualenv virtualenvwrapper |
17 | #meteor node npm | 19 | #meteor node npm |
18 | ) | 20 | ) |
19 | 21 | ||
20 | # virtualenvwrapper: | 22 | # virtualenvwrapper: |
21 | export WORKON_HOME=$HOME/.virtualenvs | 23 | export WORKON_HOME=$HOME/.virtualenvs |
22 | source /usr/local/bin/virtualenvwrapper.sh | 24 | source /usr/local/bin/virtualenvwrapper.sh |
23 | 25 | ||
24 | # Aliases | 26 | # Aliases |
25 | if [ -f $ZCFG/dotfiles/zshrc.sh ]; then | 27 | if [ -f $ZCFG/dotfiles/zshrc.sh ]; then |
26 | . $ZCFG/dotfiles/zshrc.sh | 28 | . $ZCFG/dotfiles/zshrc.sh |
27 | fi | 29 | fi |