aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

shell/zsh: reorganize load/loadalls

Browse source
This commit is contained in:
Henrik Lissner 2016-12-16 18:32:44 -05:00
parent 3ca98d4b57
commit 1fe3bbeabf
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shell/zsh/.zshenv
View file

@ -1,14 +1,12 @@
export DOTFILES="$HOME/.dotfiles" source "$HOME/.dotfiles/shell/common.sh"
source "$DOTFILES/shell/common.sh"
## Paths ## Paths
# Ensure path arrays do not contain duplicates. # Ensure path arrays do not contain duplicates.
typeset -gU cdpath fpath mailpath path typeset -gU cdpath fpath mailpath path
path=(/usr/local/{,s}bin $path) path=(/usr/local/{,s}bin $path)
load shell/env.sh load shell/zsh/config.zsh
loadall shell/zsh env.zsh loadall env.zsh
path=( path=(
$HOME/.bin $HOME/.bin

15
shell/zsh/.zshrc
View file

@ -4,14 +4,6 @@
repo "tarjoilija/zgen" "$HOME/.zgen" repo "tarjoilija/zgen" "$HOME/.zgen"
load shell/zsh/aliases.zsh
load shell/zsh/config.zsh
if is-interactive; then
load shell/zsh/completion.zsh
load shell/zsh/keybinds.zsh
load shell/zsh/prompt.zsh
fi
source "$HOME/.zgen/zgen.zsh" source "$HOME/.zgen/zgen.zsh"
if ! zgen saved; then if ! zgen saved; then
info "Creating zgen save" info "Creating zgen save"
@ -27,6 +19,13 @@ if ! zgen saved; then
zgen save zgen save
fi fi
if is-interactive; then
load shell/zsh/completion.zsh
load shell/zsh/keybinds.zsh
load shell/zsh/prompt.zsh
fi
loadall aliases.zsh
[[ -f "$HOME/.zshrc.local" ]] && source "$HOME/.zshrc.local" [[ -f "$HOME/.zshrc.local" ]] && source "$HOME/.zshrc.local"
# Done! # Done!