diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | zsh/config.zsh | 4 | ||||
| -rw-r--r-- | zsh/fpath.zsh | 2 | ||||
| -rw-r--r-- | zsh/functions/_boom (renamed from functions/_boom) | 0 | ||||
| -rw-r--r-- | zsh/functions/_brew (renamed from functions/_brew) | 0 | ||||
| -rw-r--r-- | zsh/functions/_c (renamed from functions/_c) | 0 | ||||
| -rw-r--r-- | zsh/functions/_git-rm (renamed from functions/_git-rm) | 0 | ||||
| -rw-r--r-- | zsh/functions/c (renamed from functions/c) | 0 | ||||
| -rw-r--r-- | zsh/functions/extract (renamed from functions/extract) | 0 | ||||
| -rw-r--r-- | zsh/functions/gf (renamed from functions/gf) | 0 | ||||
| m--------- | zsh/oh-my-zsh | 0 | ||||
| -rw-r--r-- | zsh/zshrc.symlink | 51 |
12 files changed, 20 insertions, 40 deletions
diff --git a/.gitmodules b/.gitmodules index d4d7847..7daa9fc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "bin/a5999026fc2abcac4cec"] path = bin/a5999026fc2abcac4cec url = https://gist.github.com/a5999026fc2abcac4cec.git -[submodule "zsh/oh-my-zsh"] - path = zsh/oh-my-zsh - url = https://github.com/robbyrussell/oh-my-zsh [submodule "fonts"] path = fonts url = https://github.com/powerline/fonts diff --git a/zsh/config.zsh b/zsh/config.zsh index bdf8f98..25fae5f 100644 --- a/zsh/config.zsh +++ b/zsh/config.zsh @@ -7,9 +7,9 @@ fi export LSCOLORS="exfxcxdxbxegedabagacad" export CLICOLOR=true -fpath=($ZSH/functions $fpath) +fpath=($DOTFILES/zsh/functions $fpath) -autoload -U $ZSH/functions/*(:t) +autoload -U $DOTFILES/zsh/functions/*(:t) HISTFILE=~/.zsh_history HISTSIZE=10000 diff --git a/zsh/fpath.zsh b/zsh/fpath.zsh index eaff4f4..b450c26 100644 --- a/zsh/fpath.zsh +++ b/zsh/fpath.zsh @@ -1,2 +1,2 @@ #add each topic folder to fpath so that they can add functions and completion scripts -for topic_folder ($ZSH/*) if [ -d $topic_folder ]; then fpath=($topic_folder $fpath); fi; +for topic_folder ($DOTFILES/zsh/*) if [ -d $topic_folder ]; then fpath=($topic_folder $fpath); fi; diff --git a/functions/_boom b/zsh/functions/_boom index 74e5d4e..74e5d4e 100644 --- a/functions/_boom +++ b/zsh/functions/_boom diff --git a/functions/_brew b/zsh/functions/_brew index 8ba6889..8ba6889 100644 --- a/functions/_brew +++ b/zsh/functions/_brew diff --git a/functions/_c b/zsh/functions/_c index 39d8cb8..39d8cb8 100644 --- a/functions/_c +++ b/zsh/functions/_c diff --git a/functions/_git-rm b/zsh/functions/_git-rm index a10baf9..a10baf9 100644 --- a/functions/_git-rm +++ b/zsh/functions/_git-rm diff --git a/functions/c b/zsh/functions/c index 486a3c6..486a3c6 100644 --- a/functions/c +++ b/zsh/functions/c diff --git a/functions/extract b/zsh/functions/extract index 018d569..018d569 100644 --- a/functions/extract +++ b/zsh/functions/extract diff --git a/functions/gf b/zsh/functions/gf index 0de3e89..0de3e89 100644 --- a/functions/gf +++ b/zsh/functions/gf diff --git a/zsh/oh-my-zsh b/zsh/oh-my-zsh deleted file mode 160000 -Subproject 15d52fd4fbabda6c3c9fad80cb4378478d86a40 diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 87c5ace..9e1d5d2 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -1,44 +1,27 @@ -# shortcut to this dotfiles path is $ZSH -export ZSH=$HOME/dotfiles - -# your project folder that we can `c [tab]` to -export PROJECTS=~/VersionControl - -# Stash your environment variables in ~/.localrc. This means they'll stay out -# of your main dotfiles repository (which may be public, like this one), but -# you'll have access to them in your scripts. -if [[ -a ~/.localrc ]] -then - source ~/.localrc +export DOTFILES=$HOME/dotfiles +export ZSH=$HOME/.oh-my-zsh +export PROJECTS=$HOME/VersionControl + +if [[ -a ~/.localrc ]]; then + source ~/.localrc fi -# all of our zsh files -typeset -U config_files -config_files=($ZSH/**/*.zsh) +for config_file ($DOTFILES/**/*.zsh) source $config_file -# load the path files -for file in ${(M)config_files:#*/path.zsh} -do - source $file -done +ZSH_THEME="agnoster" +plugins=(git) +source $ZSH/oh-my-zsh.sh -# load everything but the path and completion files -for file in ${${config_files:#*/path.zsh}:#*/completion.zsh} -do - source $file -done +source $HOME/.profile + +unsetopt ignoreeof -# initialize autocomplete here, otherwise functions won't be loaded autoload -U compinit compinit -# load every completion after autocomplete loads -for file in ${(M)config_files:#*/completion.zsh} -do - source $file +for config_file ($DOTFILES/**/completion.zsh); do + if test -f $config_file; then + source $config_file + fi done -unset config_files - -### Oh-my-zsh -ZSH_THEME="agnoster" |