From 22f690b4bfaf522c2b974692f7fc9ef0c66c4a67 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Tue, 2 Aug 2022 16:44:29 -0500 Subject: [PATCH] feat(zsh): use XDG spec --- dots/.config/zsh/config/init.zsh | 11 ++++++++--- dots/.config/zsh/config/profile/profile/env.zsh | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dots/.config/zsh/config/init.zsh b/dots/.config/zsh/config/init.zsh index 8beca577..428e72b6 100644 --- a/dots/.config/zsh/config/init.zsh +++ b/dots/.config/zsh/config/init.zsh @@ -1,18 +1,23 @@ #!/usr/bin/env zsh configure() { - autoload -U +X bashcompinit && bashcompinit + export XDG_CONFIG_HOME="${HOME}/.config" + export XDG_CACHE_HOME="${HOME}/.cache" + export XDG_DATA_HOME="${HOME}/.local/share" + export XDG_STATE_HOME="${HOME}/.local/state" + export XDG_DATA_DIRS="/usr/local/share:/usr/share" + export XDG_CONFIG_DIRS="/etc/xdg" } init() { + configure local wkdir="${BASE_ZSH_CONFIG_DIR}/config" source "${wkdir}/themes/init.zsh" - source "${wkdir}/profile/init.zsh" source "${wkdir}/style/init.zsh" source "${wkdir}/omz/init.zsh" source "${wkdir}/plugins/init.zsh" + source "${wkdir}/profile/init.zsh" source "${wkdir}/completions/init.zsh" - configure } init diff --git a/dots/.config/zsh/config/profile/profile/env.zsh b/dots/.config/zsh/config/profile/profile/env.zsh index 0d9231c4..0f976edc 100644 --- a/dots/.config/zsh/config/profile/profile/env.zsh +++ b/dots/.config/zsh/config/profile/profile/env.zsh @@ -11,8 +11,9 @@ export ZSH_AUTOSUGGEST_STRATEGY=(history completion) ### FZF ### function zvm_after_init() { - [[ -r "${XDG_DATA_CONFIG}/fzf/fzf.zsh" ]] && source "${XDG_DATA_CONFIG}fzf/fzf.zsh" + [[ -r "${XDG_CONFIG_HOME}/fzf/fzf.zsh" ]] && source "${XDG_CONFIG_HOME}fzf/fzf.zsh" } +[[ -r "${XDG_CONFIG_HOME}/fzf/fzf.zsh" ]] && source "${XDG_CONFIG_HOME}fzf/fzf.zsh" export FZF_DEFAULT_COMMAND='fd --hidden --exclude .git --color=always' export FZF_DEFAULT_OPTS="--height=80% --layout=reverse --info=inline --border --margin=1 --ansi" export FZF_CTRL_T_COMMAND="${FZF_DEFAULT_COMMAND}"