From c0d22295c80fcc0422563bb0c6753f263195ca40 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Thu, 26 Apr 2018 09:16:23 +0100
Subject: Add vim-ninja-feet

---
 qutebrowser/.config/qutebrowser/config.py |  1 -
 tmux/.tmux.conf                           |  5 ++++-
 vim/.vimrc                                |  9 ++++++++-
 zsh/.zshrc                                | 10 ++++++++--
 4 files changed, 20 insertions(+), 5 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 03e5790..342c275 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -18,4 +18,7 @@ bind -n C-Right next-window
 bind-key P swap-window -t -1
 bind-key N swap-window -t +1
 
-source-file ~/.vim/plugged/vim-wintab/tmux/wintab.tmux.conf
+WINTAB_BOUNDARY=create
+WINTAB_MODE=wintab
+WINTAB_ROOT=$HOME/Dropbox/projects/vim-wintab
+source-file $WINTAB_ROOT/wintab.tmux
diff --git a/vim/.vimrc b/vim/.vimrc
index a84c062..de94c2f 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'
@@ -62,7 +63,11 @@ Plug 'tpope/vim-unimpaired'
 Plug 'troydm/zoomwintab.vim'
 Plug 'urbainvaes/vim-remembrall'
 " Plug 'urbainvaes/vim-wintab'
+
 Plug '~/Dropbox/projects/vim-wintab'
+let g:wintab_mode = 'wintab'
+let g:wintab_boundary = 'create'
+
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'vim-scripts/ReplaceWithRegister'
@@ -71,7 +76,7 @@ Plug 'wellle/targets.vim'
 
 if has("nvim")
     " Plug 'roxma/nvim-completion-manager'
-    Plug 'Shougo/deoplete.nvim'
+    Plug 'Shougo/deoplete.nvim', { 'do' : ':UpdateRemotePlugins' }
     Plug 'zchee/deoplete-jedi'
     Plug 'hkupty/iron.nvim'
 else
@@ -378,6 +383,8 @@ inoreabbrev <expr> #!! "#!/usr/bin/env" . (empty(&filetype) ? '' : ' '.&filetype
 " Spell
 inoremap <c-s> <esc>1z=eA
 
+nmap co =o
+
 " }}}
 "" Colorscheme {{{
 function! SaveColo(...)
diff --git a/zsh/.zshrc b/zsh/.zshrc
index ec4a213..02fb8ad 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
@@ -20,6 +20,8 @@ bindkey '^w' backward-kill-word
 # }}}
 ## Options and modules {{{
 
+KEYTIMEOUT=1
+
 # History
 HISTFILE=$HOME/.zsh_history
 HISTSIZE=1000000
@@ -45,6 +47,10 @@ fi
 [ ! -d ~/.zsh/zgen ] && git clone https://github.com/tarjoilija/zgen.git ~/.zsh/zgen
 source "$HOME/.zsh/zgen/zgen.zsh"
 
+if [ "$TMUX" != "" ]; then
+    source $WINTAB_ROOT/wintab.plugin.zsh
+fi
+
 if ! zgen saved; then
     echo "Creating a zgen save"
     zgen load rupa/z
-- 
cgit v1.2.3