From feeeb2bc5c173f319c2e2c0fd48ba72eadbf8fec Mon Sep 17 00:00:00 2001
From: Steve Beaulac <steve@beaulac.me>
Date: Tue, 3 Mar 2026 19:28:35 -0500
Subject: [PATCH] fix: change variable that hold dotfiles directory

---
 installer/btop.sh  | 5 +++--
 installer/emacs.sh | 2 +-
 installer/fish.sh  | 7 +++----
 installer/fonts.sh | 2 +-
 installer/git.sh   | 2 +-
 installer/jj.sh    | 4 ++--
 installer/nvim.sh  | 5 +++--
 installer/tmux.sh  | 3 ++-
 mise.toml          | 2 +-
 9 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/installer/btop.sh b/installer/btop.sh
index fdb2a5d..f411104 100755
--- a/installer/btop.sh
+++ b/installer/btop.sh
@@ -1,8 +1,9 @@
 #!/bin/sh -e
 
-${DOTFILE_DIR}/sync-config config/btop
+${DOTFILES_DIR}/sync-config config/btop
+THEMES_DIR="${HOME}/.local/share/themes"
 
 # theme link
 mkdir -p ~/.config/btop/themes
-ln -snf ${DOTFILE_DIR}/themes/current/btop.theme ${HOME}/.config/btop/themes/current.theme
+ln -snf ${THEMES_DIR}/current/btop.theme ${HOME}/.config/btop/themes/current.theme
 
diff --git a/installer/emacs.sh b/installer/emacs.sh
index 5353c54..5413918 100755
--- a/installer/emacs.sh
+++ b/installer/emacs.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 
-${DOTFILE_DIR}/sync-config config/emacs
+${DOTFILES_DIR}/sync-config config/emacs
 
diff --git a/installer/fish.sh b/installer/fish.sh
index f31101b..401b707 100755
--- a/installer/fish.sh
+++ b/installer/fish.sh
@@ -1,11 +1,10 @@
 #!/bin/sh -e
 
-if [[ ! -x "$(command -v sjb-orgmode-installer)" ]]; then
-    echo "Error: sjb config script are not installed, run sjb-install.sh" >&2
-    exit 1
+if [[ ! -x "$(command  -v fish)" ]]; then
+    paru -Sy --needed --noconfirm fish fisher
 fi
 
-${DOTFILE_DIR}/sync-config config/fish
+${DOTFILES_DIR}/sync-config config/fish
 
 if [[ -x /usr/bin/fisher ]]; then
     fisher install franciscolourenco/done
diff --git a/installer/fonts.sh b/installer/fonts.sh
index dad19cb..481462f 100755
--- a/installer/fonts.sh
+++ b/installer/fonts.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-${DOTFILES_DIR}/sync-config config/fonts
+${DOTFILES_DIR}/sync-config config/fontconfig
 
 rsync -av ${DOTFILES_DIR}/fonts/ ${HOME}/.local/share/fonts/
 
diff --git a/installer/git.sh b/installer/git.sh
index 4374f93..f521d80 100755
--- a/installer/git.sh
+++ b/installer/git.sh
@@ -4,7 +4,7 @@ if [[ ! -x "$(command  -v git)" ]]; then
     paru -Sy --needed --noconfirm git
 fi
 
-${DOTFILE_DIR}/sync-config config/git
+${DOTFILES_DIR}/sync-config config/git
 
 GIT_CONFIG="${HOME}/.config/git/local"
 
diff --git a/installer/jj.sh b/installer/jj.sh
index 21fb39c..bdaa5cf 100755
--- a/installer/jj.sh
+++ b/installer/jj.sh
@@ -4,12 +4,12 @@ if [[ ! -x "$(command  -v jj)" ]]; then
     paru -Sy --needed --noconfirm jj 
 fi
 
-${DOTFILE_DIR}/sync-config config/jj
+${DOTFILES_DIR}/sync-config config/jj
 
 JJ_CONFIG="${HOME}/.config/jj/conf.d/local.toml"
 
 mkdir -p "$(dirname ${JJ_CONFIG})"
-cp ${DOTFILE_DIR}/installer/templates/local.toml.tmpl ${JJ_CONFIG}
+cp ${DOTFILES_DIR}/installer/templates/local.toml.tmpl ${JJ_CONFIG}
 
 if [[ -n "${SJB_USER_NAME//[[:space:]]/}" ]]; then
   sed -i "s/NAME_PLACEHOLDER/${SJB_USER_NAME}/g" ${JJ_CONFIG}
diff --git a/installer/nvim.sh b/installer/nvim.sh
index f3d5d9d..91d4684 100755
--- a/installer/nvim.sh
+++ b/installer/nvim.sh
@@ -4,13 +4,14 @@ if [[ ! -x "$(command -v nvim)" ]]; then
     paru -Sy --noconfirm neovim harper tree-sitter-cli
 fi
 
-${DOTFILE_DIR}/sync-config config/nvim
+${DOTFILES_DIR}/sync-config config/nvim
 
 # Set specific app links for current theme
 PLUGINS_DIR="${HOME}/.config/nvim/lua/plugins"
+THEMES_DIR="${HOME}/.local/share/themes"
 
 mkdir -p ${PLUGINS_DIR}
-ln -snf ${DOTFILE_DIR}/current/theme/neovim.lua ${PLUGINS_DIR}/theme.lua
+ln -snf ${THEMES_DIR}/current/theme/neovim.lua ${PLUGINS_DIR}/theme.lua
 
 uv tool install vectorcode
 
diff --git a/installer/tmux.sh b/installer/tmux.sh
index d7af1c6..fd87072 100755
--- a/installer/tmux.sh
+++ b/installer/tmux.sh
@@ -5,8 +5,9 @@ if [[ ! -x "$(command -v tmux)" ]]; then
 fi
 
 ${DOTFILES_DIR}/sync-config config/tmux
+THEMES_DIR="${HOME}/.local/share/themes"
 
-ln -snf ${DOTFILES_DIR}/themes/current/tmux ${HOME}/.config/tmux/theme
+ln -snf ${THEMES_DIR}/current/theme/tmux ${HOME}/.config/tmux/theme
 
 # setup tmux
 if [[  ! -d ~/.config/tmux/plugins/tpm ]]; then
diff --git a/mise.toml b/mise.toml
index fe7b579..153a79c 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,2 +1,2 @@
 [env]
-DOTFILE_DIR = "{{config_root}}"
+DOTFILES_DIR = "{{config_root}}"