6 files changed, 26 insertions, 27 deletions
diff --git a/fzf/.config/zsh/.zshrc.d/50-fzf.zsh b/fzf/.config/zsh/.zshrc.d/50-fzf.zsh
deleted file mode 100644
index 82e24ab..0000000
--- a/fzf/.config/zsh/.zshrc.d/50-fzf.zsh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/zsh
-# vim: ft=sh
-
-_fzf_compgen_path() {
-	fd --hidden --follow --exclude ".git" . "$1"
-}
-
-_fzf_compgen_dir() {
-	fd --type d --hidden --follow --exclude ".git" . "$1"
-}
-
-if [ -r "/usr/share/fzf/completion.zsh" ]; then
-	source /usr/share/fzf/completion.zsh
-fi
diff --git a/fzf/.config/zsh/.zshrc.d/90-fzf.zsh b/fzf/.config/zsh/.zshrc.d/90-fzf.zsh
new file mode 100644
index 0000000..756a09c
--- /dev/null
+++ b/fzf/.config/zsh/.zshrc.d/90-fzf.zsh
@@ -0,0 +1,21 @@
+#!/bin/zsh
+# vim: ft=sh
+
+_fzf_compgen_path() {
+	fd --hidden --follow --exclude ".git" . "$1"
+}
+
+_fzf_compgen_dir() {
+	fd --type d --hidden --follow --exclude ".git" . "$1"
+}
+
+if [ -r "/usr/share/fzf/completion.zsh" ]; then
+	source /usr/share/fzf/completion.zsh
+fi
+
+if [ -n "$BASE16_THEME" ] && [ -n "$BASE16_SHELL_ENABLE_VARS" ]; then
+	export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS
+--color=bg+:$BASE16_COLOR_01_HEX,bg:$BASE16_COLOR_00_HEX,spinner:$BASE16_COLOR_0C_HEX,hl:$BASE16_COLOR_0D_HEX
+--color=fg:$BASE16_COLOR_04_HEX,header:$BASE16_COLOR_0D_HEX,info:$BASE16_COLOR_0A_HEX,pointer:$BASE16_COLOR_0C_HEX
+--color=marker:$BASE16_COLOR_0C_HEX,fg+:$BASE16_COLOR_06_HEX,prompt:$BASE16_COLOR_0A_HEX,hl+:$BASE16_COLOR_0D_HEX"
+fi
diff --git a/sh/.config/profile.d/20-gruvbox.sh b/sh/.config/profile.d/20-gruvbox.sh
index 5921711..5041f03 100644
--- a/sh/.config/profile.d/20-gruvbox.sh
+++ b/sh/.config/profile.d/20-gruvbox.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-export BASE16_DEFAULT_THEME="gruvbox-dark-hard"
+export BASE16_THEME_DEFAULT="gruvbox-dark-hard"
+export BASE16_SHELL_ENABLE_VARS=1
diff --git a/sh/.config/profile.d/30-fzf.sh b/sh/.config/profile.d/30-fzf.sh
index d9e89cb..9e01fb4 100644
--- a/sh/.config/profile.d/30-fzf.sh
+++ b/sh/.config/profile.d/30-fzf.sh
@@ -12,6 +12,4 @@ export FZF_DEFAULT_OPTS='--bind ctrl-q:abort
 --bind ctrl-b:preview-page-up
 --bind ctrl-f:preview-page-down
 --bind alt-up:half-page-up
---bind alt-down:half-page-down
---color fg:#ebdbb2,hl:#fabd2f,fg+:#ebdbb2,hl+:#fabd2f
---color info:#83a598,prompt:#bdae93,spinner:#fabd2f,pointer:#83a598,marker:#fe8019,header:#665c54'
+--bind alt-down:half-page-down'
diff --git a/sh/.config/profile.d/30-vivid.sh b/sh/.config/profile.d/30-vivid.sh
index 362c155..127e7ba 100644
--- a/sh/.config/profile.d/30-vivid.sh
+++ b/sh/.config/profile.d/30-vivid.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -n "$BASE16_DEFAULT_THEME" ] && command -v vivid 1>/dev/null; then
-	LS_COLORS="$(vivid generate "$BASE16_DEFAULT_THEME" 2>/dev/null)"
+if [ -n "$BASE16_THEME_DEFAULT" ] && command -v vivid 1>/dev/null; then
+	LS_COLORS="$(vivid generate "$BASE16_THEME_DEFAULT" 2>/dev/null)"
 	export LS_COLORS
 fi
diff --git a/sheldon/.config/sheldon/plugins.toml b/sheldon/.config/sheldon/plugins.toml
index 62b52dc..73a0b0a 100644
--- a/sheldon/.config/sheldon/plugins.toml
+++ b/sheldon/.config/sheldon/plugins.toml
@@ -1,7 +1,5 @@
 [templates]
 defer = "{{ hooks?.pre | nl }}{% for file in files %}zsh-defer source \"{{ file }}\"\n{% endfor %}{{ hooks?.post | nl }}"
-base16_config = 'export BASE16_CONFIG_PATH="{{ dir }}"'
-base16_fzf = 'export BASE16_FZF_PATH="{{ dir }}"'
 
 [plugins]
 
@@ -20,11 +18,6 @@ github = "zsh-users/zsh-completions"
 
 [plugins.base16-shell]
 github = "tinted-theming/base16-shell"
-apply = ["defer", "base16_config"]
-
-[plugins.base16-fzf]
-github = "tinted-theming/base16-fzf"
-apply = ["base16_fzf"]
 
 [plugins.zsh-syntax-highlighting]
 github = "zsh-users/zsh-syntax-highlighting"