From 35de64fb26a682cf99262e56534e26d0d9054b84 Mon Sep 17 00:00:00 2001
From: Jackson Law <178053+jlaw@users.noreply.github.com>
Date: Thu, 9 Apr 2020 14:15:44 -0700
Subject: [PATCH 1/2] chore: Use $XDG_CONFIG_HOME for tmux (#549)

---
 .config/aliasrc                      | 1 +
 .tmux.conf => .config/tmux/tmux.conf | 0
 2 files changed, 1 insertion(+)
 rename .tmux.conf => .config/tmux/tmux.conf (100%)

diff --git a/.config/aliasrc b/.config/aliasrc
index 64d45af..90de3d9 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -41,3 +41,4 @@ alias \
 	magit="nvim -c MagitOnly" \
 	ref="shortcuts >/dev/null; source ${XDG_CONFIG_HOME:-$HOME/.config}/shortcutrc ; source ${XDG_CONFIG_HOME:-$HOME/.config}/zshnameddirrc" \
 	weath="less -S ${XDG_DATA_HOME:-$HOME/.local/share}/weatherreport" \
+	tmux="tmux -f ${XDG_CONFIG_HOME:-$HOME/.config}/tmux/tmux.conf"
diff --git a/.tmux.conf b/.config/tmux/tmux.conf
similarity index 100%
rename from .tmux.conf
rename to .config/tmux/tmux.conf

From 39776df7c68c3d909b2383df4a3e4f818a1d36de Mon Sep 17 00:00:00 2001
From: vired <62380689+vired@users.noreply.github.com>
Date: Fri, 10 Apr 2020 17:34:01 +0600
Subject: [PATCH 2/2] scrooloose/nerdtree has moved to preservim/nerdtree
 (#553)

---
 .config/nvim/init.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 1e4d23c..5b1605d 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -9,7 +9,7 @@ endif
 
 call plug#begin(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/plugged"'))
 Plug 'tpope/vim-surround'
-Plug 'scrooloose/nerdtree'
+Plug 'preservim/nerdtree'
 Plug 'junegunn/goyo.vim'
 Plug 'PotatoesMaster/i3-vim-syntax'
 Plug 'jreybert/vimagit'