summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2018-04-14 19:42:02 +0100
committerUrbain Vaes <urbain@vaes.uk>2018-04-14 19:42:02 +0100
commit5483bcfed6fae079fcec332ac39ca00d5d723931 (patch)
treed221c0734984f1566135afb92dee849ad7361ffa
parent63a16e686ee07760d2c9341089f55d7848870b9a (diff)
Change timeout for zsh
-rw-r--r--tmux/.tmux.conf7
-rw-r--r--vim/.vimrc2
-rw-r--r--zsh/.zshrc6
3 files changed, 9 insertions, 6 deletions
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index e0ac949..d99acac 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -12,13 +12,10 @@ bind r source-file ~/.tmux.conf
set -sg escape-time 0
set-option -g allow-rename off
-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
bind-key P swap-window -t -1
bind-key N swap-window -t +1
+
+source-file $WINTAB_ROOT/wintab.tmux.conf
diff --git a/vim/.vimrc b/vim/.vimrc
index 0fe68bf..f428cda 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -70,7 +70,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
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 1c9a10a..1422dfd 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -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"
+# export WINTAB_MODE="winonly"
+export WINTAB_ROOT=$HOME/Dropbox/projects/vim-wintab
+source $WINTAB_ROOT/wintab.plugin.zsh
+
if ! zgen saved; then
echo "Creating a zgen save"
zgen load rupa/z