From 48b9df95ab4ae1dcf5832dd158376b53cd32505d Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Fri, 26 May 2023 12:57:41 +0300
Subject: [PATCH] fix(tmux): Fix tmux configs

---
 config/exports-apps   |  2 +-
 config/tmux/tmux.conf | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/config/exports-apps b/config/exports-apps
index 6b1ecac..18fa7a8 100755
--- a/config/exports-apps
+++ b/config/exports-apps
@@ -121,6 +121,6 @@ export _Z_DATA="$XDG_STATE_HOME/z"
 export ANDROID_HOME="$XDG_DATA_HOME/android"
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
-export TMUX_CONF="$DOTFILES/config/tmux/tmux.conf"
+export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
 export BAT_THEME="ansi"
 export CHEAT_USE_FZF=true
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index adfa20b..a2889a5 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -4,6 +4,20 @@
 # - https://tmuxguide.readthedocs.io/en/latest/tmux/tmux.html
 # - https://github.com/dreamsofcode-io/tmux/blob/main/tmux.conf
 
+## Install plugins, starting with plugin manager
+set -g @tpm_plugins '           \
+ tmux-plugins/tpm               \
+ catppuccin/tmux                \
+ christoomey/vim-tmux-navigator \
+ jaclu/tmux-menus               \
+ sainnhe/tmux-fzf               \
+ tmux-plugins/tmux-continuum    \
+ tmux-plugins/tmux-resurrect    \
+ tmux-plugins/tmux-sensible     \
+ tmux-plugins/tmux-sessionist   \
+ tmux-plugins/tmux-yank         \
+'
+
 set-option -sa terminal-overrides ",xterm*:Tc"
 
 # Mouse support
@@ -69,18 +83,6 @@ set -g @resurrect-strategy-nvim 'session'
 ## https://github.com/sainnhe/tmux-fzf
 TMUX_FZF_LAUNCH_KEY="l"
 
-## Install plugins, starting with plugin manager
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'jaclu/tmux-menus'
-set -g @plugin 'christoomey/vim-tmux-navigator'
-set -g @plugin 'tmux-plugins/tmux-yank'
-set -g @plugin 'catppuccin/tmux'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'tmux-plugins/tmux-continuum'
-set -g @plugin 'tmux-plugins/tmux-sessionist'
-set -g @plugin 'sainnhe/tmux-fzf'
-
 # set vi-mode
 set-window-option -g mode-keys vi
 # keybindings
@@ -108,4 +110,3 @@ bind p paste-buffer
 
 # Finally run the tmux plugin manager
 run '~/.config/tmux/plugins/tpm/tpm'
-