summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qutebrowser/.config/qutebrowser/config.py1
-rw-r--r--tmux/.tmux.conf10
-rw-r--r--vim/.vimrc1
-rw-r--r--zsh/.zshrc4
4 files changed, 7 insertions, 9 deletions
diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py
index 487c4e8..54837da 100644
--- a/qutebrowser/.config/qutebrowser/config.py
+++ b/qutebrowser/.config/qutebrowser/config.py
@@ -41,7 +41,6 @@ config.bind("<Ctrl-N>", 'fake-key <Down>', mode='insert')
config.bind("<Ctrl-P>", 'fake-key <Up>', mode='insert')
config.bind("<Ctrl-I>", 'open-editor', mode='insert')
config.bind("<Ctrl-X>", 'spawn --userscript user-password', mode='insert')
-config.unbind("<Shift-Ins>", mode="insert") # Fix bug with shift-insert
# Bindings for command mode
config.bind('<Ctrl-W>', 'fake-key -g <Ctrl-Backspace>', mode='command')
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 9baf9f3..e0ac949 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -12,12 +12,10 @@ bind r source-file ~/.tmux.conf
set -sg escape-time 0
set-option -g allow-rename off
-is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
- | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
-bind -n C-h if-shell "$is_vim" "send-keys C-h" 'if-shell "[ #{pane_at_left} -eq 1 ]" "select-window -p" "select-pane -L"'
-bind -n C-l if-shell "$is_vim" "send-keys C-l" 'if-shell "[ #{pane_at_right} -eq 1 ]" "select-window -n" "select-pane -R"'
-bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
-bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
+bind -n C-h if-shell "[ #{pane_at_left} -eq 1 ]" "select-window -p" "select-pane -L"
+bind -n C-l if-shell "[ #{pane_at_right} -eq 1 ]" "select-window -n" "select-pane -R"
+bind -n C-j "select-pane -D"
+bind -n C-k "select-pane -U"
bind -n C-Left previous-window
bind -n C-Right next-window
diff --git a/vim/.vimrc b/vim/.vimrc
index a50e392..0fe68bf 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -46,6 +46,7 @@ Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' }
Plug 'terryma/vim-expand-region'
Plug 'terryma/vim-multiple-cursors'
Plug 'tommcdo/vim-exchange'
+Plug 'tommcdo/vim-ninja-feet'
Plug 'ton/vim-bufsurf'
Plug 'tpope/vim-abolish'
Plug 'tpope/vim-commentary'
diff --git a/zsh/.zshrc b/zsh/.zshrc
index ec4a213..1c9a10a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -6,8 +6,8 @@ bindkey -v
bindkey -a 'k' history-beginning-search-backward
bindkey -a 'j' history-beginning-search-forward
bindkey '^?' backward-delete-char # backspace
-bindkey '^N' history-beginning-search-forward
-bindkey '^P' history-beginning-search-backward
+bindkey '^n' history-beginning-search-forward
+bindkey '^p' history-beginning-search-backward
bindkey '^a' beginning-of-line
bindkey '^b' backward-char
bindkey '^e' end-of-line