1 files changed, 21 insertions, 18 deletions

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index d46bf88..d748fa6 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -4,9 +4,7 @@ let &t_ZM = "\e[3m"
 call plug#begin('~/.local/share/nvim/plugged')
 
 Plug 'airblade/vim-gitgutter'
-Plug 'andymass/vim-matchup'
 Plug 'godlygeek/tabular'
-Plug 'jiangmiao/auto-pairs'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 Plug 'junegunn/fzf.vim'
 Plug 'mattn/emmet-vim', {'for': ['javascript.jsx', 'html', 'css']}
@@ -24,14 +22,11 @@ Plug 'tpope/vim-fugitive'
 " syntax and friends
 Plug 'rust-lang/rust.vim', {'for': 'rust'}
 Plug 'lervag/vimtex', {'for': 'tex'}
-Plug 'neovimhaskell/haskell-vim', {'for': 'haskell'}
+Plug 'neovimhaskell/haskell-vim', {'for': ['haskell', 'cabal']}
 Plug 'elmcast/elm-vim'
 Plug 'LnL7/vim-nix'
 
-" colorschemes
-Plug 'nerdypepper/agila.vim'
-Plug 'nerdypepper/chestnut.vim'
-Plug 'nerdypepper/vim-colors-plain', { 'branch': 'duotone' }
+Plug 'git@ferrn:vim/vim-colors-plain'
 
 call plug#end()
 
@@ -55,6 +50,20 @@ augroup restorecursor
                                 \ endif
 augroup END
 
+augroup vimrc-incsearch-highlight
+    autocmd!
+    autocmd CmdlineEnter /,\? :set hlsearch
+    autocmd CmdlineLeave /,\? :set nohlsearch
+augroup END
+
+augroup fzfstatus
+    if has('nvim') && !exists('g:fzf_layout')
+      autocmd! FileType fzf
+      autocmd  FileType fzf set laststatus=0 noshowmode noruler
+        \| autocmd BufLeave <buffer> set laststatus=2 showmode ruler
+    endif
+augroup END
+
 " general settings
 set nobackup
 set nowritebackup
@@ -72,12 +81,11 @@ set laststatus=2
 set nowrap
 set noshowmode
 set listchars=tab:┊\ ,nbsp:␣,trail:·,extends:>,precedes:<
-set fillchars=vert:\│
+set fillchars=vert:\│,stl:\ ,stlnc:\ 
 set ignorecase
 set smartcase
 set sidescroll=40
 set incsearch
-set hlsearch
 set undofile
 set undodir=~/tmp
 set path+=**
@@ -89,7 +97,6 @@ set complete=.,w,b,i,u,t,
 set background=dark
 set mouse=a
 set conceallevel=0
-set nocursorline
 set nonumber
 set grepprg=rg\ --vimgrep\ --no-heading
 set grepformat=%f:%l:%c:%m,%f:%l:%m
@@ -98,6 +105,7 @@ set shortmess+=c
 set updatetime=300
 set signcolumn=yes
 set inccommand=split
+set showmatch
 
 let g:netrw_browsex_viewer= "xdg-open"
 
@@ -118,6 +126,7 @@ endfunction
 :command! WQ wq
 :command! Wq wq
 :command! Wqa wqa
+:command! WQa wqa
 :command! W w
 :command! Q q
 
@@ -165,10 +174,8 @@ let g:fzf_colors =
   \ 'marker':  ['fg', 'Keyword'],
   \ 'spinner': ['fg', 'Label'],
   \ 'header':  ['fg', 'Comment'] }
-
-" indentLine
-let g:indentLine_setColors = 0
-let g:indentLine_char      = '┆'
+let g:fzf_layout = { 'down': '40%' }
+let g:fzf_preview_window = []
 
 let g:latex_view_general_viewer = 'zathura'
 let g:vimtex_view_method = "zathura"
@@ -176,10 +183,6 @@ let g:vimtex_view_method = "zathura"
 " man pages
 let g:ft_man_open_mode = 'tab'
 
-" vim-matchup
-let g:matchup_matchparen_deferred = 1
-let g:matchup_matchparen_hi_surround_always = 1
-
 " coc-nvim
 hi CocHintSign ctermfg=6
 hi CocErrorSign ctermfg=1