Index: create_symlinks.sh
==================================================================
--- create_symlinks.sh
+++ create_symlinks.sh
@@ -15,11 +15,11 @@
 which git >/dev/null 2>&1 && link_file git .config/git ../
 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 ../
 which zsh >/dev/null 2>&1 && link_file zshrc .zshrc
 

Index: fish/functions/gpg-sftp.fish
==================================================================
--- fish/functions/gpg-sftp.fish
+++ 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

Index: fish/functions/gpg-ssh-add.fish
==================================================================
--- fish/functions/gpg-ssh-add.fish
+++ 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

Index: fish/functions/gpg-ssh.fish
==================================================================
--- fish/functions/gpg-ssh.fish
+++ 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

ADDED   fish/functions/tmux.fish
Index: fish/functions/tmux.fish
==================================================================
--- fish/functions/tmux.fish
+++ fish/functions/tmux.fish
@@ -0,0 +1,3 @@
+function tmux
+    command tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf $argv
+end

DELETED tmux.conf
Index: tmux.conf
==================================================================
--- tmux.conf
+++ tmux.conf
@@ -1,16 +0,0 @@
-set -g default-terminal screen-256color
-setw -g mode-keys vi
-set -g status-style bg=colour233,fg=colour25
-set -g status-left "#[fg=colour52]#S #[fg=colour24]⧉ "
-set -g status-right "#[fg=colour22]#(whoami)#[fg=colour28]@#h #[fg=colour40]#(date +%H:%M)"
-set -w -g window-status-current-style fg=colour39,bg=colour236
-set -w -g window-status-bell-style fg=colour233,bg=colour124
-bind -r C-h select-pane -L
-bind -r C-j select-pane -D
-bind -r C-k select-pane -U
-bind -r C-l select-pane -R
-bind -r M-h resize-pane -L
-bind -r M-j resize-pane -D
-bind -r M-k resize-pane -U
-bind -r M-l resize-pane -R
-set -ag terminal-overrides ",*:XT@"

ADDED   tmux/tmux.conf
Index: tmux/tmux.conf
==================================================================
--- tmux/tmux.conf
+++ tmux/tmux.conf
@@ -0,0 +1,16 @@
+set -g default-terminal screen-256color
+setw -g mode-keys vi
+set -g status-style bg=colour233,fg=colour25
+set -g status-left "#[fg=colour52]#S #[fg=colour24]⧉ "
+set -g status-right "#[fg=colour22]#(whoami)#[fg=colour28]@#h #[fg=colour40]#(date +%H:%M)"
+set -w -g window-status-current-style fg=colour39,bg=colour236
+set -w -g window-status-bell-style fg=colour233,bg=colour124
+bind -r C-h select-pane -L
+bind -r C-j select-pane -D
+bind -r C-k select-pane -U
+bind -r C-l select-pane -R
+bind -r M-h resize-pane -L
+bind -r M-j resize-pane -D
+bind -r M-k resize-pane -U
+bind -r M-l resize-pane -R
+set -ag terminal-overrides ",*:XT@"

Index: zshrc
==================================================================
--- zshrc
+++ zshrc
@@ -188,10 +188,12 @@
 		*)
 			=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 &&
 	alias pkg_rolling-replace="MAKEFLAGS= pkg_rolling-replace"