From 2955787cf2954cc11f8559eeebec3c37b96dba5b Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Wed, 16 Oct 2019 09:49:04 -0700 Subject: [PATCH] WIP: Add a buncha TODOs --- vim/rc/edit.rc.vim | 1 + vim/rc/init.rc.vim | 3 +++ vim/rc/keymap.rc.vim | 1 + vim/rc/plugins.rc.vim | 18 +++++++++++------- vim/rc/plugins/ctrlp.rc.vim | 1 + vim/rc/plugins/vim-grepper.rc.vim | 1 + vim/rc/ui.rc.vim | 17 ++++------------- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/vim/rc/edit.rc.vim b/vim/rc/edit.rc.vim index 71e3721..96cd8ed 100644 --- a/vim/rc/edit.rc.vim +++ b/vim/rc/edit.rc.vim @@ -1,3 +1,4 @@ +" TODO: Maybe consolodate into the init.rc.vim " Tab functionality set expandtab set tabstop=4 diff --git a/vim/rc/init.rc.vim b/vim/rc/init.rc.vim index 8f95961..d369ebb 100644 --- a/vim/rc/init.rc.vim +++ b/vim/rc/init.rc.vim @@ -1,7 +1,9 @@ +" TODO: Should this go in the original init? "Allows filetype detection filetype on filetype plugin indent on +" TODO: Myabe rename keymap and move this " Enable mouse input set mousehide set mouse=a @@ -18,5 +20,6 @@ else set viminfo='100,n~/.vim/tmp/viminfo.vim endif +" TODO: Should this go somewhere else? " Filetype extension au BufRead,BufNewFile *.md set syntax=markdown diff --git a/vim/rc/keymap.rc.vim b/vim/rc/keymap.rc.vim index 4e3c296..1fc83ff 100644 --- a/vim/rc/keymap.rc.vim +++ b/vim/rc/keymap.rc.vim @@ -65,6 +65,7 @@ nmap cf va{zf%:nohlsearch vnoremap pp p vnoremap po "_dP +" TODO: Versions of this for vim8 if has('nvim') " make term exiting easier tnoremap diff --git a/vim/rc/plugins.rc.vim b/vim/rc/plugins.rc.vim index 343620f..d9da77e 100644 --- a/vim/rc/plugins.rc.vim +++ b/vim/rc/plugins.rc.vim @@ -32,6 +32,10 @@ if !exists('g:gui_oni') endif " }} Searching +" TODO: Maybe replace with coc.nvim. If I'm doing a lot of development, I will +" have latest versions of vim or nvim +" Only need one fallback, maybe neocomplcache + " Autocomplete {{ call s:smart_source_rc('plugins/omnicompletion') if exists('g:gui_oni') @@ -52,11 +56,16 @@ call s:smart_source_rc('plugins/tcomment_vim') if (v:version > 703) && !exists('g:gui_oni') Plug 'ludovicchabant/vim-gutentags' " Auto generate tags files end + +" TODO: Probably remove if has('nvim') Plug 'kassio/neoterm', { 'on': ['TREPLSend', 'TREPLSendFile', 'T'] } command! Tig :T tig command! Tox :T tox endif + +" TODO: Maybe ALE. Similar reason as coc.nvim. Probably only using latest vim +" if developing seriously if (has('nvim') || v:version >= 800) call s:smart_source_rc('plugins/neomake') else @@ -112,13 +121,6 @@ call s:smart_source_rc('plugins/python') " Themes {{ Plug 'altercation/vim-colors-solarized' -Plug 'vim-scripts/candy.vim' -Plug 'vim-scripts/eclipse.vim' -Plug 'morhetz/gruvbox' -Plug 'nanotech/jellybeans.vim' -Plug 'vim-scripts/nuvola.vim' -Plug 'vim-scripts/summerfruit256.vim' -Plug 'therubymug/vim-pyte' Plug 'vim-scripts/vividchalk.vim' Plug 'vim-scripts/wombat256.vim' " }} @@ -126,7 +128,9 @@ call s:smart_source_rc('plugins/goyo-limelight') " Distraction free editing " System {{ +" TODO: Do I need this? Plug 'Shougo/vimproc.vim', { 'do': 'make' } +" Definitely using these. Plug 'tpope/vim-endwise' Plug 'tpope/vim-eunuch' Plug 'tpope/vim-repeat' diff --git a/vim/rc/plugins/ctrlp.rc.vim b/vim/rc/plugins/ctrlp.rc.vim index 7ddab67..eefb514 100644 --- a/vim/rc/plugins/ctrlp.rc.vim +++ b/vim/rc/plugins/ctrlp.rc.vim @@ -48,3 +48,4 @@ if executable('ag') " ag is fast enough we don't need cache let g:ctrlp_use_caching = 0 endif +" TODO: Add rg support diff --git a/vim/rc/plugins/vim-grepper.rc.vim b/vim/rc/plugins/vim-grepper.rc.vim index bf58544..855f082 100644 --- a/vim/rc/plugins/vim-grepper.rc.vim +++ b/vim/rc/plugins/vim-grepper.rc.vim @@ -20,3 +20,4 @@ if executable('ack') set grepprg=ack command -nargs=+ Ack :GrepperAck endif +" TODO: Add rg diff --git a/vim/rc/ui.rc.vim b/vim/rc/ui.rc.vim index f21212d..a656f05 100644 --- a/vim/rc/ui.rc.vim +++ b/vim/rc/ui.rc.vim @@ -15,6 +15,7 @@ set hls " Color Schemes {{ " Set theme based on $VIM_COLOR variable +" TODO: move other colorscheme detection block up try if !empty($VIM_COLOR) colorscheme $VIM_COLOR @@ -27,27 +28,18 @@ catch /^Vim\%((\a\+)\)\=:E185/ " This happens when first installing bundles colorscheme default endtry - -" Override gui colorscheme -if IsGuiApp() - colorscheme wombat256mod -endif - -" Set Airline theme -if g:colors_name == 'github' - let g:airline_theme = 'solarized' -endif " }} -" Set gui fonts {{ +" Set gui specific values {{ if IsGuiApp() + colorscheme wombat256mod if IsWindows() set guifont=Consolas:h10:b elseif IsMac() try set guifont=DejaVu\ Sans\ Mono\ for\ Powerline:h11 catch - " Failed to set font + " Failed to set font, ok with default endtry endif endif @@ -70,7 +62,6 @@ if &term =~ "^screen" set t_ut= endif set notitle -" set title " }} " Function and command to update colors based on light and dark mode