aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbozo.kopic <bozo.kopic@gmail.com>2020-05-09 22:38:14 +0200
committerbozo.kopic <bozo.kopic@gmail.com>2020-05-09 22:38:14 +0200
commita0bd7bdcb2241f5106d77fcebbc5d00e9088e7a3 (patch)
tree54e4b65abb593aaf4d4894b381b971c5a3a48add
parent6c9130e407ab4a7d67588ba2cc47c39d0839cfe2 (diff)
.
-rw-r--r--tmux/.tmux.conf16
-rw-r--r--vim/.vimrc1
2 files changed, 13 insertions, 4 deletions
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 9eec3eb..10820d5 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -22,10 +22,11 @@ bind-key -n 'C-M-Right' next
bind-key -n 'C-M-Up' new-window
bind-key -n 'C-M-Down' confirm-before -p "kill-window #W? (y/n)" kill-window
-bind-key -n 'C-M-h' select-pane -L
-bind-key -n 'C-M-l' select-pane -R
-bind-key -n 'C-M-k' select-pane -U
-bind-key -n 'C-M-j' select-pane -D
+bind-key -n 'C-M-h' prev
+bind-key -n 'C-M-l' next
+bind-key -n 'C-M-k' new-window
+bind-key -n 'C-M-j' confirm-before -p "kill-window #W? (y/n)" kill-window
+
#bind-key -n 'C-M-\\' split-window -h
#bind-key -n 'C-M-\-' split-window
bind-key -n 'C-M-x' confirm-before -p "kill-pane #P? (y/n)" kill-pane
@@ -37,3 +38,10 @@ bind-key 'Down' select-pane -P 'fg=black,bg=white'
bind-key ] run "xclip -o -selection clipboard | tmux load-buffer - && tmux paste-buffer"
+
+
+set -g @plugin 'christoomey/vim-tmux-navigator'
+
+if "test ! -d ~/.tmux/plugins/tpm" \
+ "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
+run -b '~/.tmux/plugins/tpm/tpm'
diff --git a/vim/.vimrc b/vim/.vimrc
index 80f5007..7b42ff0 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -35,6 +35,7 @@ Plug 'w0rp/ale'
Plug 'Valloric/YouCompleteMe'
Plug 'thaerkh/vim-indentguides'
Plug 'vim-scripts/paredit.vim'
+Plug 'christoomey/vim-tmux-navigator'
"Plug 'dleonard0/pony-vim-syntax'
"Plug 'terryma/vim-multiple-cursors'