init.vim

@@ -91,9 +91,6 @@
         " open file at linenumber via <filename>:<linenumber>
         Plug 'wsdjeg/vim-fetch'
 
-        " smart view preservation (replacement of manual mkview and loadview)
-        " Plug 'zhimsel/vim-stay' " TODO: jry
-
         " Todo lists
         Plug 'vuciv/vim-bujo'
 
@@ -234,8 +231,6 @@ tnoremap <Esc> <C-\><C-n>
 
     " Lightline
         "\   'colorscheme': 'solarized',
-        " \       'gitbranch': '%{exists("*fugitive#head") && fugitive#head()!=""?"".fugitive#head():""}',
-        " \       'gitbranch': '%{FugitiveStatusline()}',
     let g:lightline = {
         \   'active': {
         \       'left':[
@@ -294,7 +289,7 @@ tnoremap <Esc> <C-\><C-n>
     set noshowmode
     set noshowmatch
     set nolazyredraw
-    " let loaded_matchparen = 1 " disable matching parentheses
+    let loaded_matchparen = 1 " disable matching parentheses
     set foldcolumn=2 " display where folds are defined - but only in 2 layer (increment 2 to add more layers)
 " }}}
 
@@ -324,7 +319,6 @@ set smartcase
     set list
 " }}}
 
-" TODO: jry: disable this in favor of vim-stay
 " save folds in files {{{
     augroup autofolding
         autocmd!
@@ -344,7 +338,7 @@ endif
 " Todo config {{{
     let g:bujo#todo_file_path = stdpath('data') . '/bujo'
     command! TODO execute "botright Todo g"
-    let g:bujo#window_width = 80
+    let g:bujo#window_width = 60
 
     function BujoSearchCustom(pattern)
         return (search(a:pattern, 'nc', line('.')) || search(a:pattern, 'nbc', line('.')))
@@ -388,12 +382,6 @@ endif
     augroup END
 " }}}
 
-" JIX Notes {{{
-    if $USER =~ "^jry$"
-        command! NOTE exec "botright 80 vs " . glob('~/') . 'Notes/Notes' . (FugitiveHead() != "" ? '_'.FugitiveHead() : '')
-    end
-" }}}
-
 " Fuzzy finding
 " TODO: Figure out fuzzy finding on windows
 if !(has('win32') || has('win64'))
@@ -455,7 +443,7 @@ endif
     call neomake#configure#automake('nrwi', 500)
 
     " Autoopen error list
-    let g:neomake_open_list = 2 " 0: show hints, 1: show list and move cursor to list, 2: show list, but don't move cursor
+    let g:neomake_open_list = 2
 
     " Configure for C
     let g:c_syntax_for_h=1
@@ -502,12 +490,6 @@ endif
     "         \ ]
     " endif
 
-    " Configure python at JI
-    if $USER =~ "^jry$"
-        let g:neomake_python_enabled_makers = [] " disable python checking, since it checks for python2, but in production it is python3
-    endif
-
-
     " let g:neomake_perl_perlcritic_postprocess = {
     "     \ entry -> entry.text =~# 'Private subroutine/method used (Use published APIs)'
     "     \ ? extend(entry, {'valid': -1})
@@ -812,8 +794,6 @@ nnoremap g# g#zz
  endfunction
 command! -nargs=* ZZ call ZZWrap(<f-args>)
 
-nnoremap <Space> :nohl<CR>
-
 function! InsertSnip(snip_name)
     " Find the template
     if a:snip_name =~ '^JIX/'