Commit f7f123531ece1773bfca79c23c6839337efc3545
1 parent
d0872834e0
Exists in
master
and in
2 other branches
zshrc
Showing 1 changed file with 11 additions and 13 deletions Side-by-side Diff
templates/zshrc.sh
| ... | ... | @@ -6,10 +6,12 @@ export ZCFG=~/.config/zsh-config |
| 6 | 6 | # Path to your oh-my-zsh installation. |
| 7 | 7 | export ZSH=$ZCFG/tools/oh-my-zsh |
| 8 | 8 | |
| 9 | -# Set name of the theme to load. | |
| 10 | -# Look in ~/.oh-my-zsh/themes/ | |
| 11 | -# Optionally, if you set this to "random", it'll load a random theme each | |
| 12 | -# time that oh-my-zsh is loaded. | |
| 9 | +export LANG=en_US.UTF-8 | |
| 10 | + | |
| 11 | +# Compilation flags | |
| 12 | +export ARCHFLAGS="-arch x86_64" | |
| 13 | + | |
| 14 | +# Themes are in (...)/oh-my-zsh/themes/ or "random" | |
| 13 | 15 | ZSH_THEME="muse" |
| 14 | 16 | |
| 15 | 17 | CASE_SENSITIVE="true" |
| ... | ... | @@ -26,12 +28,15 @@ plugins=(command-not-found common-aliases debian dirhistory git history history- |
| 26 | 28 | meteor node npm |
| 27 | 29 | ) |
| 28 | 30 | |
| 31 | +if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then | |
| 32 | + . ~/.config/zsh-config/templates/bash_aliases | |
| 33 | +fi | |
| 34 | + | |
| 29 | 35 | # User configuration |
| 30 | 36 | export PATH=$HOME/bin:/usr/local/bin:$PATH |
| 31 | 37 | # export MANPATH="/usr/local/man:$MANPATH" |
| 32 | 38 | |
| 33 | 39 | source $ZSH/oh-my-zsh.sh |
| 34 | -export LANG=en_US.UTF-8 | |
| 35 | 40 | |
| 36 | 41 | # ANTIGEN: |
| 37 | 42 | # |
| ... | ... | @@ -76,11 +81,4 @@ export LANG=en_US.UTF-8 |
| 76 | 81 | # export EDITOR='vim' |
| 77 | 82 | # else |
| 78 | 83 | # export EDITOR='mvim' |
| 79 | -# fi | |
| 80 | - | |
| 81 | -# Compilation flags | |
| 82 | -export ARCHFLAGS="-arch x86_64" | |
| 83 | - | |
| 84 | -if [ -f ~/.bash_aliases ]; then | |
| 85 | - . ~/.bash_aliases | |
| 86 | -fi | |
| 84 | +# fi | |
| 87 | 85 | \ No newline at end of file |