Make tmux use XDG basedir - somewhat

create_symlinks.sh

@@ -17,7 +17,7 @@ if which gpg >/dev/null 2>&1 || which gpg2 >/dev/null 2>&1; then
 	mkdir -p $HOME/.local/share/gnupg
 	link_file gpg.conf .local/share/gnupg/gpg.conf ../../../
 fi
-which tmux >/dev/null 2>&1 && link_file tmux.conf .tmux.conf
+which tmux >/dev/null 2>&1 && link_file tmux .config/tmux ../
 which vim >/dev/null 2>&1 && link_file vim .config/vim ../
 which fish >/dev/null 2>&1 && link_file fish .config/fish ../
 which youtube-dl >/dev/null 2>&1 && link_file youtube-dl .config/youtube-dl ../

fish/functions/gpg-sftp.fish

@@ -1,4 +1,4 @@
-function gpg-sftp
+function gpg-sftp --wraps sftp
     set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
     sftp $argv
 end

fish/functions/gpg-ssh-add.fish

@@ -1,4 +1,4 @@
-function gpg-ssh-add
+function gpg-ssh-add --wraps ssh-add
     set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
     ssh-add $argv
 end

fish/functions/gpg-ssh.fish

@@ -1,4 +1,4 @@
-function gpg-ssh
+function gpg-ssh --wraps ssh
     set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
     ssh $argv
 end

fish/functions/tmux.fish

@@ -0,0 +1,3 @@
+function tmux
+    command tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf $argv
+end

zshrc

@@ -191,6 +191,8 @@ make() {
 	esac
 }
 
+alias tmux="tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf"
+
 # pkgsrc does not like MAKEFLAGS including -j
 which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
 which pkg_rolling-replace &>/dev/null &&