diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim
index 632dc97..7e7784a 100644
--- a/neovim/.config/nvim/init.vim
+++ b/neovim/.config/nvim/init.vim
@@ -1,77 +1,71 @@
-if ($TERM=~"xterm-256color" || $TERM=~"screen-256color") || exists('g:GtkGuiLoaded')
-    call plug#begin('~/.config/nvim/plugins')
-    Plug 'cloudhead/neovim-fuzzy'
-    Plug 'mhinz/vim-signify'
-    Plug 'overcache/NeoSolarized'
-    Plug 'LnL7/vim-nix'
-    Plug 'neovimhaskell/haskell-vim'
-    call plug#end()
+call plug#begin('~/.config/nvim/plugins')
+Plug 'cloudhead/neovim-fuzzy'
+Plug 'mhinz/vim-signify'
+Plug 'overcache/NeoSolarized'
+Plug 'LnL7/vim-nix'
+Plug 'neovimhaskell/haskell-vim'
+call plug#end()
 
+if ($TERM=~"xterm-256color" || $TERM=~"screen-256color")
     colorscheme NeoSolarized
     set background=light
     set termguicolors
-
-    " https://github.com/cloudhead/neovim-fuzzy/issues/50
-    let g:fuzzy_rootcmds = [["git", "rev-parse", "--show-toplevel"]]
-
-    map <silent> <C-P> :FuzzyOpen<CR>
-
-    if exists('g:GtkGuiLoaded')
-        call rpcnotify(1, 'Gui', 'Font', 'Fantasque Sans Mono 13')
-    endif
 endif
 
 filetype plugin indent on
 
+" https://github.com/cloudhead/neovim-fuzzy/issues/50
+let g:fuzzy_rootcmds = [["git", "rev-parse", "--show-toplevel"]]
+
 let g:markdown_fenced_languages = ['python', 'bash=sh', 'go', 'c', 'cpp', 'yaml', 'json', 'sql', 'haskell']
 
-set autoindent
-set autoread
 set autowrite
 set expandtab
-set hidden
 set ignorecase
-set incsearch
 set laststatus=2
 set linebreak
 set list listchars=tab:▸\ ,trail:·
 set mouse=a
 set nofoldenable
 set nojoinspaces
+set nowrap
 set number
-set path+=**
 set printoptions=paper:A4,syntax:n,number:y
-set shiftwidth=4
+set shiftwidth=2
 set showbreak=↪\
 set splitbelow
 set splitright
 set statusline=\(%n\)\ %<%.99f\ %y\ %w%m%r%=%-14.(%l,%c%V%)\ %P
-set tabstop=4
 set textwidth=120
 set wrapscan
 
 let mapleader=" "
 let maplocalleader=" "
 
+map <silent> <C-i> <NOP>
+map <silent> <C-o> :FuzzyOpen<CR>
+map <silent> <C-_> :FuzzyGrep<CR>
+
 nnoremap <silent> <esc><esc> :nohls<CR>
 
 nnoremap <silent> gB :bp<CR>
 nnoremap <silent> gb :bn<CR>
 
-"noremap p p`[
-"noremap P P`[
-
 " https://github.com/neovim/neovim/pull/13268
-unmap Y
+if matchstr(execute('version'), 'NVIM v0.\zs[^\n]') > 5
+  unmap Y
+endif
+
+function! s:StripTrailing()
+  let l = line(".")
+  let c = col(".")
+  %s/\s\+$//e
+  call cursor(l, c)
+endfunction
 
 augroup vimrc
-    autocmd!
-    autocmd BufNewFile,BufRead *.pdc,*.pandoc setlocal filetype=markdown
-    autocmd BufNewFile,BufRead Vagrantfile setlocal filetype=ruby
-    autocmd FileType puppet setlocal tw=140
-    autocmd FileType bash,zsh,sh,ruby,yaml setlocal sw=2
-    autocmd FileType go setlocal noexpandtab sw=8 ts=8
-
-    " restore cursor
-    "autocmd VimLeave * set guicursor=a:ver90
+  autocmd!
+  autocmd BufWritePre * call s:StripTrailing()
+  autocmd BufNewFile,BufRead *.pdc,*.pandoc setlocal filetype=markdown
+  autocmd FileType go setlocal noexpandtab sw=8
 augroup END
diff --git a/zsh/.zshrc b/zsh/.zshrc
index d5abd71..f9faa1d 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,4 +1,3 @@
-autoload -U +X colors && colors
 autoload -U +X compinit && compinit
 autoload -U +X bashcompinit && bashcompinit
 autoload -Uz vcs_info
@@ -18,6 +17,7 @@ setopt append_history
 setopt extended_history
 setopt histignorealldups
 setopt histignorespace
+setopt histfcntllock
 
 bindkey -e
 
@@ -46,27 +46,34 @@ zstyle ':completion:*' use-cache yes
 zstyle ':completion:*' menu select=2
 
 zstyle ':vcs_info:*' enable git
-zstyle ':vcs_info:*' formats "[%{$fg_bold[cyan]%}%b%{$reset_color%}]"
-zstyle ':vcs_info:*' actionformats "[%{$fg_bold[cyan]%}%b%{$reset_color%}|%a]"
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:*' formats "[%B%F{cyan}%b%f%%b]"
+zstyle ':vcs_info:*' actionformats "[%B%F{cyan}%b%f%%b|%a]"
 
-# cut shown $PWD if depth is 4 or more ('~' counts)
-truncated_pwd="%(4~|.../%2~|%~)"
-# cut shown $PWD after 20 characters
-#truncated_pwd="%20<...<%~%<<"
-
-shell_indicator=""
+local shell_indicator=""
 [[ -f /run/.containerenv && -f /run/.toolboxenv ]] && shell_indicator="%F{13}⬢%f "
 
-PROMPT="${shell_indicator}(%M) ${truncated_pwd} %{$fg[red]%}%(#~#~$)%{$reset_color%} "
+local user_color="red"
+let $UID && user_color="13"
+
+local user="%B%F{${user_color}}%n%f%b"
+local at="@"
+local host="%B%m%b "
+local dollar="%F{red}%(#~#~$)%f "
+local percent="%# "
+local rc="%B%F{red}%(?..%? )%f%b"
+local dir="%(4~|.../%2~|%~) "
+
+PROMPT="${shell_indicator}${user}${at}${host}${dir}${dollar}"
 RPROMPT="\$vcs_info_msg_0_"
 
 precmd () {
-  print -Pn "\e]0;(%M) %~\a"
+  print -Pn "\e]0;%n@%m: %~\a"
   vcs_info
 }
 
 preexec () {
-  print -Pn "\e]0;(%M) $1\a"
+  print -Pn "\e]0;%n@%m: $1\a"
 }
 
 sshl() {