From 4170b20c2d3fb9a11cc75a1229cda7368154cc95 Mon Sep 17 00:00:00 2001
From: Ethan Holz <ethan2@vt.edu>
Date: Mon, 21 Jun 2021 13:23:43 -0400
Subject: [PATCH] Moved tmux to .config

---
 .gitignore                               | 1 +
 tmux.conf => tmux/.config/tmux/tmux.conf | 0
 zsh/.config/zsh/.zshrc                   | 8 ++++----
 zsh/.config/zsh/zsh-aliases              | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename tmux.conf => tmux/.config/tmux/tmux.conf (100%)

diff --git a/.gitignore b/.gitignore
index c3ee557..ab7f207 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ nvim/.config/nvim/plugin
 nvim/.config/nvim/spell
 zsh/.config/zsh/plugins/*
 zsh/.config/zsh/.zcompdump
+tmux/.config/tmux/plugins/*
 
diff --git a/tmux.conf b/tmux/.config/tmux/tmux.conf
similarity index 100%
rename from tmux.conf
rename to tmux/.config/tmux/tmux.conf
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index f1016a2..f229767 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -5,14 +5,14 @@ export PATH=$HOME/bin:/usr/local/bin:$HOME/.local/bin:$HOME/.luarocks/bin:$PATH
 if [[ $(uname -r) == *"WSL"* ]]; then
         export PATH=/mnt/c/Users/iplay/AppData/Local/Programs/Microsoft\ VS\ Code/bin:/mnt/c/Windows/System32/:$PATH
 fi
-if [ -x "$(command -v tmux)" ] && [ -n "${DISPLAY}" ]; then
-  [ -z "${TMUX}" ] && { tmux attach || tmux; } >/dev/null 2>&1
-fi
-# Soruce zsh-functions
 source "$ZDOTDIR/zsh-functions"
 zsh_add_file "zsh-aliases"
 zsh_add_plugin "zsh-users/zsh-autosuggestions"
 zsh_add_plugin "zsh-users/zsh-syntax-highlighting"
+if [ -x "$(command -v tmux)" ] && [ -n "${DISPLAY}" ]; then
+  [ -z "${TMUX}" ] && { tmux attach || tmux; } >/dev/null 2>&1
+fi
+# Soruce zsh-functions
 
 export GPG_TTY=$(tty)
 # Opting not to source the bootstrap file and will run this manually
diff --git a/zsh/.config/zsh/zsh-aliases b/zsh/.config/zsh/zsh-aliases
index eaa74fe..bfb0449 100644
--- a/zsh/.config/zsh/zsh-aliases
+++ b/zsh/.config/zsh/zsh-aliases
@@ -6,3 +6,4 @@ alias lla='ls -la'
 alias lt='ls --tree'
 alias coz='$EDITOR ~/.zshrc'
 alias py-act='source env/bin/activate'
+alias tmux='tmux -f ~/.config/tmux/tmux.conf'
-- 
2.51.2