Dot_Files/zsh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use correct directory pathing

Browse Source
This commit is contained in:
Price Hiller 2022-07-30 19:11:38 -05:00
parent 1ce2420b91
commit 8c6561ea0e
7 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.config/zsh/config/completions/init.zsh
View File

@ -1,7 +1,8 @@
#!/usr/bin/env zsh #!/usr/bin/env zsh
init() { init() {
FPATH="${FPATH}:${BASE_ZSH_CONFIG_DIR}/config/completions/completions" local wkdir="${BASE_ZSH_CONFIG_DIR}/config/completions"
FPATH="${FPATH}:${wkdir}/completions"
autoload -Uz compinit autoload -Uz compinit
compinit compinit

11
.config/zsh/config/init.zsh
View File

@ -5,11 +5,12 @@ configure() {
} }
init() { init() {
source ./themes/init.zsh local wkdir="${BASE_ZSH_CONFIG_DIR}/config"
source ./omz/init.zsh source "${wkdir}/themes/init.zsh"
source ./programs/init.zsh source "${wkdir}/omz/init.zsh"
source ./profile/init.zsh source "${wkdir}/programs/init.zsh"
source ./style/init.zsh source "${wkdir}/profile/init.zsh"
source "${wkdir}/style/init.zsh"
configure configure
} }

6
.config/zsh/config/omz/init.zsh
View File

@ -30,12 +30,12 @@ configure() {
fi fi
export plugins export plugins
export ZSH_AUTOSUGGEST_STRATEGY=(history completion)
} }
init() { init() {
export ZSH="${OMZ_DIRS}/omz/omz/.oh-my-zsh" local wkdir="${BASE_ZSH_CONFIG_DIR}/config/omz"
export ZSH_CUSTOM="${OMZ_DIRS}/" export ZSH="${wkdir}/omz/.oh-my-zsh"
export ZSH_CUSTOM="${wkdir}/"
configure configure
source "${ZSH}/oh-my-zsh.sh" source "${ZSH}/oh-my-zsh.sh"

9
.config/zsh/config/profile/init.zsh
View File

@ -5,9 +5,12 @@ configure() {
} }
init() { init() {
source ./profile/options.zsh
source ./profile/env.zsh local wkdir="${BASE_ZSH_CONFIG_DIR}/config/profile"
source ./profile/pathing.zsh source "${wkdir}/profile/options.zsh"
source "${wkdir}/profile/env.zsh"
source "${wkdir}/profile/functions.zsh"
source "${wkdir}/profile/aliases.zsh"
configure configure
} }

3
.config/zsh/config/profile/profile/env.zsh
View File

@ -48,6 +48,9 @@ if [[ "$OSTYPE" = "darwin"* ]]; then
# Zsh # Zsh
FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}" FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
_import_custom_bash_completions _import_custom_bash_completions
autoload -Uz compinit
compinit
fi fi
fi fi

6
.config/zsh/config/themes/init.zsh
View File

@ -10,11 +10,13 @@
# omz. # omz.
configure() { configure() {
source ./config.zsh local wkdir="${BASE_ZSH_CONFIG_DIR}/config/themes"
source "${wkdir}/config.zsh"
} }
init() { init() {
source ./powerlevel10k/powerlevel10k.zsh-theme local wkdir="${BASE_ZSH_CONFIG_DIR}/config/themes"
source "${wkdir}/powerlevel10k/powerlevel10k.zsh-theme"
} }
init init

2
.config/zsh/zsh
View File

@ -1,4 +1,4 @@
#!/usr/bin/env zsh #!/usr/bin/env zsh
export BASE_ZSH_CONFIG_DIR="$(dirname -- "$( readlink -f -- "${0}" )")" export BASE_ZSH_CONFIG_DIR="$(dirname -- "$( readlink -f -- "${0}" )")"
source ./config/init.zsh source "${BASE_ZSH_CONFIG_DIR}/config/init.zsh"