From 4eb00e69155baae256aa32fb20eb4a5f04c85ca3 Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Tue, 12 Mar 2019 15:47:07 +0100
Subject: [PATCH] fix XDG_CONFIG_HOME naming

---
 .config/tmux/tmux.conf                    | 4 +---
 .config/zsh/5-install-tmux-plugin-manager | 2 +-
 .profile                                  | 3 +--
 .zshrc                                    | 6 +++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 1232fcf..ed86395 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -50,13 +50,11 @@ set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q'
 #run-shell ~/.tmux-plugins/resurrect/resurrect.tmux
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
-# Recently removed due to causing too many incompatibilities with how I want it set up
-#set -g @plugin 'tmux-plugins/tmux-pain-control'
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
 set -g @plugin 'Morantron/tmux-fingers'
 
-run -b "${TMUX_PLUGIN_MANAGER_PATH}/tpm/tpm"
+run "${TMUX_PLUGIN_MANAGER_PATH}/tpm/tpm"
 
 #####################
 ## 3. KEYBINDINGS  ##
diff --git a/.config/zsh/5-install-tmux-plugin-manager b/.config/zsh/5-install-tmux-plugin-manager
index f790f20..8452097 100644
--- a/.config/zsh/5-install-tmux-plugin-manager
+++ b/.config/zsh/5-install-tmux-plugin-manager
@@ -1,6 +1,6 @@
 # Clone tmux plugin manager if not existing
 if [[ -z "$TPM_PARENT_DIR" ]]; then
-  TPM_PARENT_DIR=${XDG_CONFIG_DIR:-$HOME/.config}/tmux
+  TPM_PARENT_DIR=${XDG_CONFIG_HOME:-$HOME/.config}/tmux
 fi
 
 if [[ ! -f $TPM_PARENT_DIR/plugins/tpm/tpm ]]; then
diff --git a/.profile b/.profile
index 2f62290..aaa87e5 100644
--- a/.profile
+++ b/.profile
@@ -1,5 +1,4 @@
-export XDG_CONFIG_DIR="$HOME/.config"
-export XDG_CONFIG_HOME=$XDG_CONFIG_DIR
+export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_CACHE_HOME="$HOME/.cache"
  
 export EDITOR=nvim
diff --git a/.zshrc b/.zshrc
index c392c02..672ce74 100644
--- a/.zshrc
+++ b/.zshrc
@@ -29,7 +29,7 @@ print_dbg() {
 # Clone zgen if you haven't already
 check_zgen_installation() {
   if [[ -z "$ZGEN_PARENT_DIR" ]]; then
-    ZGEN_PARENT_DIR=${${XDG_CONFIG_DIR}:="$HOME/.config/"}
+    ZGEN_PARENT_DIR=${${XDG_CONFIG_HOME}:="$HOME/.config/"}
     ZGEN_DIR="$ZGEN_PARENT_DIR/zgen"
   fi
   if [[ ! -f $ZGEN_DIR/zgen.zsh ]]; then
@@ -90,9 +90,9 @@ load_config_files() {
 
 # Set ZSH_CONFIG_DIR to default to ~/.config/zsh, or let user override
 # Exit early if no configuration directory has been found
-if [ ! -d ${ZSH_CONFIG_DIR:="${XDG_CONFIG_DIR:-$HOME/.config}/zsh"} ]; then
+if [ ! -d ${ZSH_CONFIG_DIR:="${XDG_CONFIG_HOME:-$HOME/.config}/zsh"} ]; then
   # If the user explicitly overrode the path give him an error
-  if [ ! $ZSH_CONFIG_DIR = "${XDG_CONFIG_DIR:-$HOME/.config/}/zsh" ]; then
+  if [ ! $ZSH_CONFIG_DIR = "${XDG_CONFIG_HOME:-$HOME/.config/}/zsh" ]; then
     printf "\$ZSH_CONFIG_DIR=$ZSH_CONFIG_DIR/ does not exist.\n"
   fi
   PS1="$HOME $ "