Move complete tmux config to ~/.config

Blackjacx · Nov 21, 2023 · bea2ce3 · bea2ce3
1 parent 7d072f7
commit bea2ce3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/bootstrap/bootstrap.sh b/bootstrap/bootstrap.sh
@@ -360,11 +360,21 @@ linkConfigurationFiles() {
   # Finds hidden dotfiles and uses safe syntax to execute loop
   find "$SCRIPT_DIR/bootstrap/dotfiles" -type f -iname ".*" -print0 | while read -r -d $'\0' file
   do
-    link_dir="${HOME}"
+    link_dir="${HOME}/"
     log "Link dotfile $file --> $link_dir"
     ln -sf "$file" "$link_dir/"
   done
 
+  # Finds dotfiles that should be linked into ~/.config/<tool>/
+  find "$SCRIPT_DIR/bootstrap/config_files" -type f -print0 | while read -r -d $'\0' file
+  do
+    link_dir="${HOME}/.config/"
+    tool_name=$(basename "$file" | cut -d'.' -f1)
+    mkdir "$link_dir" > /dev/null 2>&1; 
+    log "Link config file $file --> $link_dir/$tool_name"
+    ln -sf "$file" "$link_dir/$tool_name"
+  done
+
   find "$SCRIPT_DIR/bootstrap/zsh_config_files" -type f -iname "*" -print0 | while read -r -d $'\0' file
   do
     link_dir="${ZSH_CUSTOM:-${HOME}/.oh-my-zsh/custom}"

diff --git a/bootstrap/dotfiles/.tmux.conf → bootstrap/config_files/tmux.conf b/bootstrap/dotfiles/.tmux.conf → bootstrap/config_files/tmux.conf
@@ -86,6 +86,8 @@ set -g @plugin 'dreamsofcode-io/catppuccin-tmux'
 # Persists tmux environment across system restarts.
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 
+# Update plugins install path
+set-environment -g TMUX_PLUGIN_MANAGER_PATH "${HOME}/.config/tmux/plugins"
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-run "${HOME}/.tmux/plugins/tpm/tpm"
+run "${HOME}/.config/tmux/plugins/tpm/tpm"