Minor changes

2 files changed, 13 insertions, 38 deletions

diff --git a/vim/.vim/after/plugin/generalized_motion.vim b/vim/.vim/after/plugin/generalized_motion.vim
deleted file mode 100644
index a2b4284..0000000
--- a/vim/.vim/after/plugin/generalized_motion.vim
+++ /dev/null
@@ -1,31 +0,0 @@
-"" More general ; {{{1
-
-let g:generalized_motion = "f"
-function! Generalized_motion(...)
-    if a:0 > 0
-        let g:generalized_motion=a:1
-        echom "Generalized motion:" g:generalized_motion
-        if (g:generalized_motion == "f") | call feedkeys('f', 'n') | return | endif
-        if (g:generalized_motion == "t") | call feedkeys('t', 'n') | return | endif
-        if (g:generalized_motion == "s") | call feedkeys("\<Plug>Sneak_s") | return | endif
-    endif
-    if (g:generalized_motion == "f") | call feedkeys(';', 'n') | endif
-    if (g:generalized_motion == "t") | call feedkeys(';', 'n') | endif
-    if (g:generalized_motion == "s") | call feedkeys("\<Plug>Sneak_;") | return | endif
-    try
-        if (g:generalized_motion == "]q") | cnext | endif
-        if (g:generalized_motion == "[q") | cprevious | endif
-        if (g:generalized_motion == "]a") | next | endif
-        if (g:generalized_motion == "[a") | previous | endif
-        if (g:generalized_motion == "]b") | bnext | endif
-        if (g:generalized_motion == "[b") | bprevious | endif
-        if (g:generalized_motion == "]f") | call feedkeys("\<Plug>unimpairedDirectoryPrevious") | endif
-        if (g:generalized_motion == "[f") | call feedkeys("\<Plug>unimpairedDirectoryPrevious") | endif
-    catch
-        call feedkeys(';', 'n')
-    endtry
-endfunction
-for mapping in ['f', 't', 's', ']q', '[q', ']a', '[a', ']f', '[f', ']b', '[b']
-    exe "nmap <silent>" mapping ":<c-u>call Generalized_motion('".mapping."')<cr>"
-endfor
-nnoremap <silent> ; :<c-u>call Generalized_motion()<cr>
diff --git a/vim/.vimrc b/vim/.vimrc
index f715c13..abf20f6 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -89,6 +89,7 @@ Plug 'KKPMW/moonshine-vim'
 Plug 'KKPMW/sacredforest-vim'
 Plug 'junegunn/seoul256.vim'
 Plug 'romainl/Apprentice'
+Plug 'joshdick/onedark.vim'
 " Plug 'josuegaleas/jay'
 call plug#end()
 
@@ -234,17 +235,22 @@ let g:vimtex_view_method='zathura'
 let g:vimtex_quickfix_mode=2
 let g:vimtex_compiler_progname='nvr'
 let g:vimtex_syntax_enabled=1
-let  g:vimtex_fold_types = {
-       \ 'preamble' : {'enabled' : 0},
-       \ 'envs' : {
-       \   'blacklist' : ['lemma', 'proposition', 'theorem', 'equation'],
-       \   'whitelist' : ['proof'],
-       \ },
-       \}
+" let  g:vimtex_fold_types = {
+"        \ 'preamble' : {'enabled' : 0},
+"        \ 'envs' : {
+"        \   'blacklist' : ['lemma', 'proposition', 'theorem', 'equation'],
+"        \   'whitelist' : ['proof'],
+"        \ },
+"        \}
 
 " Pilot
 let g:pilot_boundary='ignore'
 let g:pilot_mode='wintab'
+" let g:pilot_key_h='<a-h>'
+" let g:pilot_key_j='<a-j>'
+" let g:pilot_key_k='<a-k>'
+" let g:pilot_key_l='<a-l>'
+" let g:pilot_key_p='<a-\>'
 
 " YouCompleteMe
 let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']