Skip to content

Commit 1d53224

Browse files
committed
Source top-level topic dir zsh files only
See holman/dotfiles#311
1 parent 21c43e2 commit 1d53224

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

zsh/zlogin.symlink

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ setopt NULLGLOB
55

66
# All of our login zsh files
77
typeset -U login_files
8-
login_files=($DOTFILES/**/login.zsh)
8+
login_files=($DOTFILES/*/login.zsh)
99

1010
# Run all login files
1111
for file in ${login_files}; do

zsh/zlogout.symlink

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ setopt NULLGLOB
33

44
# All of our logout zsh files
55
typeset -U logout_files
6-
logout_files=($DOTFILES/**/logout.zsh)
6+
logout_files=($DOTFILES/*/logout.zsh)
77

88
# Run all logout files
99
for file in ${logout_files}; do

zsh/zprofile.symlink

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ setopt NULLGLOB
55

66
# All of our profile zsh files
77
typeset -U profile_files
8-
profile_files=($DOTFILES/**/profile.zsh)
8+
profile_files=($DOTFILES/*/profile.zsh)
99

1010
# Run all profile files
1111
for file in ${profile_files}; do

zsh/zshenv.symlink

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export EDITOR="vim"
1414

1515
# Path and env zsh files
1616
typeset -U path_files env_files
17-
path_files=($DOTFILES/**/path.zsh)
18-
env_files=($DOTFILES/**/env.zsh)
17+
path_files=($DOTFILES/*/path.zsh)
18+
env_files=($DOTFILES/*/env.zsh)
1919

2020
# Load the path files
2121
for file in ${path_files}; do

zsh/zshrc.symlink

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ setopt NULLGLOB EXTENDEDGLOB
33

44
# All of our non-path/env/profile/login/logout zsh files
55
typeset -U interactive_files completion_files
6-
interactive_files=($DOTFILES/**/*.zsh~**/completion.zsh~**/path.zsh~**/env.zsh~**/profile.zsh~**/login.zsh~**/logout.zsh)
7-
completion_files=($DOTFILES/**/completion.zsh)
6+
interactive_files=($DOTFILES/*/*.zsh~*/completion.zsh~*/path.zsh~*/env.zsh~*/profile.zsh~*/login.zsh~*/logout.zsh)
7+
completion_files=($DOTFILES/*/completion.zsh)
88

99
# Load interactive files (everything but the completion, path, env,
1010
# profile, login, and logout files)

0 commit comments

Comments
 (0)