diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2020-04-10 08:02:58 -0400 |
|---|---|---|
| committer | Luke Smith <luke@lukesmith.xyz> | 2020-04-10 08:02:58 -0400 |
| commit | fa0deff9a5c74ce4b6cd99fa6f5aa8543138ca8b (patch) | |
| tree | bab04dfd2eafe0ea7ea37fc14f8013209060a7b9 | |
| parent | 7aabe16b9d623df0405ff71b6e7b73e82fae3cda (diff) | |
| parent | 39776df7c68c3d909b2383df4a3e4f818a1d36de (diff) | |
| download | eibhear-fa0deff9a5c74ce4b6cd99fa6f5aa8543138ca8b.tar.gz eibhear-fa0deff9a5c74ce4b6cd99fa6f5aa8543138ca8b.tar.zst eibhear-fa0deff9a5c74ce4b6cd99fa6f5aa8543138ca8b.zip | |
Merge branch 'master' of github.com:LukeSmithxyz/voidrice
| -rw-r--r-- | .config/aliasrc | 1 | ||||
| -rw-r--r-- | .config/nvim/init.vim | 2 | ||||
| -rw-r--r-- | .config/tmux/tmux.conf (renamed from .tmux.conf) | 0 |
3 files changed, 2 insertions, 1 deletions
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/.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' diff --git a/.tmux.conf b/.config/tmux/tmux.conf index 6d85cc7..6d85cc7 100644 --- a/.tmux.conf +++ b/.config/tmux/tmux.conf |