Big gruvbox implementation and removal of ephemera.vim

1 files changed, 36 insertions, 8 deletions

diff --git a/vim/vimrc b/vim/vimrc
index 2093b56..37455f5 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -45,7 +45,8 @@ set signcolumn=yes
 set colorcolumn=0
 set equalalways
 set showmode
-set listchars=tab:»→,trail:␣
+set list
+set listchars=tab:»-,trail:␣,leadmultispace:---+,eol:\\U000021b5
 set shortmess+=c
 set tags+=./tags
 set background=dark
@@ -62,9 +63,6 @@ endfunction
 
 nnoremap <leader>q :call TaskWarriorAddCurrentLine()<CR>
 
-" colorscheme goes here, outside source control
-source ~/.vim/ephemera.vim
-highlight SignColumn guibg=blue ctermbg=black
 
 " macro to go to end of sentence and add a line break (for
 " one-line-per-sentence vimming...)
@@ -109,6 +107,7 @@ Plug 'junegunn/fzf.vim'
 Plug 'szw/vim-maximizer'
 Plug 'ycm-core/YouCompleteMe'
 Plug 'airblade/vim-tailwind'
+Plug 'morhetz/gruvbox'
 Plug 'lambdalisue/fern.vim'
 Plug 'junegunn/goyo.vim'
 Plug 'sheerun/vim-polyglot'
@@ -158,10 +157,10 @@ nnoremap gd :YcmCompleter GoToDefinition<CR>
 nnoremap <leader>gr :YcmCompleter GoToReferences<CR>
 nnoremap K :YcmCompleter GetDoc<CR>
 " this will disable tab, allowing it to be used for ultisnips
-let g:ycm_key_list_select_completion=[]
-let g:ycm_key_list_previous_completion=[]
-" let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
-" let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
+" let g:ycm_key_list_select_completion=[]
+" let g:ycm_key_list_previous_completion=[]
+let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
+let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
 let g:ycm_python_interpreter_path = '.venv/bin/python3'
 let g:ycm_auto_trigger = 1
 let g:ycm_python_sys_path = []
@@ -208,6 +207,7 @@ let g:ale_fixers = {
 \			'javascript': ['eslint'],
 \           'go': ['gofmt'],
 \			'cpp': ['clang-format'],
+\			'c': ['clang-format'],
 \           'rust': ['rustfmt']
 \           }
 let g:ale_python_mypy_ignore_invalid_syntax = 1
@@ -315,3 +315,31 @@ let g:fzf_colors =
   nnoremap <silent> <leader>CC :Commands<CR>
   imap <C-x><C-f> <plug>(fzf-complete-file-ag)
   imap <C-x><C-l> <plug>(fzf-complete-line)
+
+" COLORSCHEME BITS -
+" This is imported from the old ephemera.vim file which has now been removed
+"
+" I got the following from gruvbox docs
+"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
+"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
+"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
+if (has("nvim"))
+"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
+	let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+endif
+"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
+"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
+" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
+if (has("termguicolors"))
+	set termguicolors
+endif
+
+"colorscheme gruber-darker
+let g:gruvbox_contrast_dark = "hard"
+let g:gruvbox_italicize_strings = 1
+let g:gruvbox_improved_strings = 1
+let g:gruvbox_improved_warnings = 1
+let g:gruvbox_invert_indent_guides = 1
+let g:gruvbox_invert_signs = 0
+colorscheme gruvbox
+" END OF COLORSCHEME BITS -