From 0b73d545946fa1d62a66138ad30e46cd0f8d358e Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Tue, 26 Mar 2019 10:50:50 +0100
Subject: Improve zsh bindings

---
 git/.gitconfig                  |   1 +
 i3/.config/i3/config            |   1 +
 mutt/.mutt/muttrc               |   2 +-
 vim/.vim/spell/en.utf-8.add     |   4 ++++
 vim/.vim/spell/en.utf-8.add.spl | Bin 880 -> 897 bytes
 vim/.vimrc                      |  10 ++++++++--
 zsh/.zshrc                      |  12 +++++++-----
 7 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index f44fe0e..0e7df50 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,5 +1,6 @@
 [core]
 	fileMode = false
+        whitespace = true
 [user]
 	name = Urbain Vaes
 	email = urbain@vaes.uk
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index c500e17..dc439fc 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -141,6 +141,7 @@ client.background       $background
 smart_borders           on
 
 bar {
+    position bottom
     status_command i3blocks
     i3bar_command  i3bar -t
     modifier none
diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc
index 1595175..de98ad0 100644
--- a/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@ -61,7 +61,7 @@ auto_view text/html
 alternative_order text/plain text/enriched text/html
 
 # Editor
-set editor="nvim"
+set editor="$EDITOR"
 set include=yes
 
 
diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add
index cea9a65..41b0cdf 100644
--- a/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@ -51,3 +51,7 @@ indices
 minima
 nondegenerate
 colinear
+periodized
+hypoelliptic
+pointwise
+nonsymmetric
diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl
index 9920420..3809c8d 100644
Binary files a/vim/.vim/spell/en.utf-8.add.spl and b/vim/.vim/spell/en.utf-8.add.spl differ
diff --git a/vim/.vimrc b/vim/.vimrc
index f09edfd..f0411a2 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -344,6 +344,7 @@ nnoremap <Leader>r :Start %:p<cr>
 nnoremap <Leader>R :Start! %:p<cr>
 
 nnoremap cqo :copen<cr>
+nnoremap cqh :colder<cr>
 nnoremap cqc :cclose<cr>
 
 nnoremap got :call system('urxvt -cd '.getcwd().' &')<cr>
@@ -379,9 +380,10 @@ nnoremap ,s :source %<cr>
 inoreabbrev <expr> #!! "#!/usr/bin/env" . (empty(&filetype) ? '' : ' '.&filetype)
 
 " Spell
-inoremap <c-s> <esc>1z=eA
+inoremap <nowait> <c-g> <esc>h1z=ea
+nnoremap <Leader>s 1z=
 
-" Projectionist
+" Projectionist 
 nnoremap ,e :E
 
 " Unimpaired
@@ -534,3 +536,7 @@ if has("nvim")
     tnoremap <c-_> <c-\><c-n><c-^>
     nnoremap <Leader>t :b term \| norm A<cr>
 endif
+
+"" Experimental {{{1
+set wildcharm=<C-z>
+nnoremap ,e :e **/*<C-z><S-Tab>
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 5f20ad3..503bedb 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -2,6 +2,10 @@
 [[ -z $DISPLAY && -z $SSH_CONNECTION && $XDG_VTNR -eq 1 ]] && exec startx
 # }}}
 ## Bindings {{{
+
+# Load fzf bindings here because we will override ^r
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
 bindkey -v
 bindkey -a 'k' history-beginning-search-backward
 bindkey -a 'j' history-beginning-search-forward
@@ -17,6 +21,7 @@ bindkey '^k' kill-line
 bindkey '^u' kill-whole-line
 bindkey '^v' visual-mode
 bindkey '^w' backward-kill-word
+bindkey '^r' history-incremental-search-backward
 
 autoload -z edit-command-line
 zle -N edit-command-line
@@ -77,18 +82,15 @@ bindkey '^z' z
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=6'
 
 # }}}
-## fzf {{{
-
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+## Use fzf with z {{{
 
-# Use fzf with z
 unalias z 2> /dev/null
 z() {
   [ $# -gt 0 ] && _z "$*" && return
   cd "$(_z -l 2>&1 | fzf --height 40% --reverse --inline-info +s --tac --query "$*" | sed 's/^[0-9,.]* *//')"
   zle && zle reset-prompt
 }
-zle     -N   z
+zle -N z
 
 # }}}
 ## Colors {{{
-- 
cgit v1.2.3