From b86846433e9e2d5057dfbfc855bcc4a16a5cda77 Mon Sep 17 00:00:00 2001
From: Deon Spengler <deon@spengler.co.za>
Date: Thu, 12 Sep 2019 09:44:32 +0200
Subject: [PATCH] Updated to modules

---
 vimrc | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/vimrc b/vimrc
index ea0a564..e30c75e 100644
--- a/vimrc
+++ b/vimrc
@@ -1,3 +1,6 @@
+" set encoding type
+set encoding=utf-8
+
 " vim-plug automatic installationx
 if empty(glob('~/.vim/autoload/plug.vim'))
   silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
@@ -12,18 +15,13 @@ Plug 'honza/vim-snippets'
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'tpope/vim-fugitive'
-Plug 'tmhedberg/SimpylFold'
 Plug 'maralla/completor.vim'
-Plug 'vim-syntastic/syntastic'
 Plug 'scrooloose/nerdcommenter'
-Plug 'scrooloose/nerdtree'
+Plug 'ctrlpvim/ctrlp.vim'
 Plug 'nanotech/jellybeans.vim'
 Plug 'rakr/vim-one'
 call plug#end()
 
-" set encoding type
-set encoding=utf-8
-
 " be iMproved
 set nocompatible
 
@@ -38,7 +36,7 @@ syntax on
 autocmd FileType python set colorcolumn=80
 
 " spell checking
-imap <F5> <C-o>:setlocal spell! spelllang=en_us<CR>
+map <F5> :setlocal spell! spelllang=en_us<CR>
 autocmd FileType mail set spell spelllang=en_us
 autocmd FileType text set spell spelllang=en_us
 
@@ -84,11 +82,16 @@ set ignorecase
 set smartcase
 
 " rebind <leader> key
-let mapleader=","
+let mapleader=";"
 
 " map sort function to a key
 vnoremap <leader>s :sort<CR>
 
+" easier buffer navigation
+map ;n :bn<cr>
+map ;p :bp<cr>
+map ;d :bd<cr>
+
 " easier moving of code block indentation
 vnoremap < <gv
 vnoremap > >gv
@@ -107,19 +110,6 @@ let g:airline#extensions#tabline#buffer_min_count = 2
 " UltiSnips
 let g:UltiSnipsExpandTrigger="<C-j>"
 
-" Configure code folding for python
-autocmd Syntax python normal zR
-
-" configure syntastic
-let g:syntastic_always_populate_loc_list = 1
-let g:syntastic_auto_loc_list = 0
-let g:syntastic_check_on_open = 0
-let g:syntastic_check_on_wq = 0
-let g:syntastic_python_pylint_args = "--load-plugins pylint_django"
-
-" bind <C-n> for nerdtree
-map <C-n> :NERDTreeToggle<CR>
-
 " set color scheme
 set t_Co=256
 colorschem jellybeans