even more cleanup in vimrc

1 files changed, 10 insertions, 36 deletions

diff --git a/vim/vimrc b/vim/vimrc
index 71d4947..f8e6a87 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -34,6 +34,8 @@
 " implement a plugin for fast-reading (check if one exists first ;))
 " plugins on vim.org etc.
 "
+" syntastic! https://github.com/vim-syntastic/syntastic
+" vimproc! https://github.com/Shougo/vimproc.vim
 " pathogen / vundle           DONE
 " NerdTree                    DONE
 " minibufexpl                 DONE
@@ -131,7 +133,7 @@ let maplocalleader="\_"
 
 " {{{ misc
 
-set expandtab
+set foldmethod=marker
 set nowrap
 
 set nocompatible
@@ -197,8 +199,9 @@ set colorcolumn=73
 " {{{ tabs
 set listchars=tab:>.
 set tabstop=8
-set shiftwidth=4
+set expandtab
 set softtabstop=4
+set shiftwidth=4
 set shiftround
 " }}}
 
@@ -321,14 +324,6 @@ nnoremap <leader>lq :copen<cr>
 augroup filetype_custom_highlight
     autocmd!
     au BufRead,BufNewFile *.twig set filetype=htmljinja
-    au BufRead,BufNewFile *.md set filetype=markdown
-augroup END
-" }}}
-
-" {{{ vim
-augroup filetype_vim
-    autocmd!
-    autocmd FileType vim setlocal foldmethod=marker
 augroup END
 " }}}
 
@@ -353,33 +348,12 @@ augroup END
 " {{{ haskell
 augroup filetype_haskell
     autocmd!
-    autocmd FileType haskell setlocal foldmethod=marker
-"    autocmd Filetype haskell map <F5> :w<ENTER>:term cabal -- exec runghc %<ENTER>
-" autocmd Filetype haskell map <F5> :w<ENTER>:term make<ENTER>
-  "  autocmd Filetype haskell map <F5> :w<ENTER>:term make<ENTER>
-    autocmd FileType haskell setlocal expandtab
+"   autocmd FileType haskell setlocal foldmethod=marker
+"   autocmd Filetype haskell map <F5> :w<ENTER>:term cabal -- exec runghc %<ENTER>
+"   autocmd Filetype haskell map <F5> :w<ENTER>:term make<ENTER>
+"   autocmd Filetype haskell map <F5> :w<ENTER>:term make<ENTER>
+"   autocmd FileType haskell setlocal expandtab
 augroup END
 " }}}
 
 " }}}
-
-" {{{ NEOVIM
-
-if has("nvim")
-  " Make escape work in the Neovim terminal.
-  tnoremap <Esc> <C-\><C-n>
-
-  " Make navigation into and out of Neovim terminal splits nicer.
-  tnoremap <C-h> <C-\><C-N><C-w>h
-  tnoremap <C-j> <C-\><C-N><C-w>j
-  tnoremap <C-k> <C-\><C-N><C-w>k
-  tnoremap <C-l> <C-\><C-N><C-w>l
-
-  " I like relative numbering when in normal mode.
-  autocmd TermOpen * setlocal conceallevel=0 colorcolumn=0 relativenumber
-
-  " Prefer Neovim terminal insert mode to normal mode.
-  autocmd BufEnter term://* startinsert
-endif
-
-" }}}