From 63a16e686ee07760d2c9341089f55d7848870b9a Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 13 Apr 2018 20:26:18 +0100 Subject: Add vim ninja feet --- zsh/.zshrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zsh') 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 -- cgit v1.2.3 From 5483bcfed6fae079fcec332ac39ca00d5d723931 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 14 Apr 2018 19:42:02 +0100 Subject: Change timeout for zsh --- tmux/.tmux.conf | 7 ++----- vim/.vimrc | 2 +- zsh/.zshrc | 6 ++++++ 3 files changed, 9 insertions(+), 6 deletions(-) (limited to 'zsh') 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 -- cgit v1.2.3 From 3c7228deb4585c55e65b107e0b31d45f2345e061 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 17 Apr 2018 18:18:11 +0100 Subject: Correct bug with i3blocks --- i3/.config/i3blocks/config | 4 ++-- tmux/.tmux.conf | 3 +++ vim/.vimrc | 16 ++++++++++++---- zsh/.zshrc | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) (limited to 'zsh') diff --git a/i3/.config/i3blocks/config b/i3/.config/i3blocks/config index 93850ee..bd9357e 100644 --- a/i3/.config/i3blocks/config +++ b/i3/.config/i3blocks/config @@ -31,13 +31,13 @@ signal=1 [primary] label= -command=echo "$(xclip -o | cut -c1-9)" +command=echo "$(xclip -o | cut -c1-9 | sed -e 's/[^a-zA-Z0-9\-]/_/g')" min_width=15 interval=5 [clipboard] label= -command=echo "$(xclip -o -selection "clipboard" | cut -c1-9)" +command=echo "$(xclip -o -selection "clipboard" | cut -c1-9 | sed -e 's/[^a-zA-Z0-9\-]/_/g')" instance=Master interval=5 diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index d99acac..71bc79d 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 +WINTAB_BOUNDARY=create +WINTAB_MODE=wintab +WINTAB_ROOT=$HOME/Dropbox/projects/vim-wintab source-file $WINTAB_ROOT/wintab.tmux.conf diff --git a/vim/.vimrc b/vim/.vimrc index f428cda..72e0847 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -61,7 +61,8 @@ Plug 'tpope/vim-sensible' Plug 'tpope/vim-surround' Plug 'tpope/vim-unimpaired' Plug 'urbainvaes/vim-remembrall' -Plug 'urbainvaes/vim-wintab' +" Plug 'urbainvaes/vim-wintab' +Plug '~/Dropbox/projects/vim-wintab' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'vim-scripts/ReplaceWithRegister' @@ -236,6 +237,9 @@ let g:vimtex_view_method='zathura' let g:vimtex_quickfix_mode=2 let g:vimtex_compiler_progname='nvr' +let g:wintab_boundary='create' +let g:wintab_mode='wintab' + " YouCompleteMe let g:ycm_key_list_select_completion = ['', ''] let g:ycm_key_list_previous_completion = ['', ''] @@ -324,6 +328,7 @@ nmap [w AddWhiteSpaceBefore nnoremap w :update nnoremap q :q nnoremap d :bd! +nnoremap :q nnoremap ,bd :ls:bd @@ -427,15 +432,18 @@ augroup vimrc " Filetype specific autocmd FileType cmake setlocal commentstring=#%s autocmd FileType cpp setlocal commentstring=//%s - autocmd FileType dirvish setlocal errorformat=%f - autocmd FileType dirvish setlocal relativenumber - autocmd FileType dirvish silent! unmap autocmd FileType freefem comp freefem autocmd FileType gmsh setlocal makeprg=gmsh\ % autocmd FileType gnuplot setlocal commentstring=#%s autocmd FileType gnuplot setlocal makeprg=gnuplot\ % autocmd FileType python setlocal makeprg=python\ % autocmd FileType tex setlocal spell + + " Dirvish + autocmd FileType dirvish nnoremap t :!touch % + autocmd FileType dirvish setlocal errorformat=%f + autocmd FileType dirvish setlocal relativenumber + autocmd FileType dirvish silent! unmap augroup END " }}} diff --git a/zsh/.zshrc b/zsh/.zshrc index 1422dfd..8906910 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -142,6 +142,7 @@ alias vs="vim -S Session.vim" alias g='git' alias ga='git add' alias gc='git commit' +alias gco='git checkout' alias gd='git diff' alias gl='git pull' alias gp='git push' -- cgit v1.2.3