M .vimrc → .vimrc

@@ -2,12 +2,11 @@ source ~/vimconfigbase.vim
 
 call plug#begin(expand('~/.vim/plugged'))
 
-Plug 'morhetz/gruvbox'
-
-
+Plug 'jaredgorski/spacecamp'
 
 call plug#end()
 
 
+set termguicolors
 
-colorscheme gruvbox
+colorscheme spacecamp

M init.vim → init.vim

@@ -85,28 +85,12 @@ Plug 'tomasr/molokai'
 Plug 'srcery-colors/srcery-vim'
 Plug 'rakr/vim-one'
 Plug 'morhetz/gruvbox'
-Plug 'NLKNguyen/papercolor-theme'
-let g:srcery_italic = 1
 
 call plug#end()
 
 
-"Credit joshdick
-"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 (empty($TMUX))
-  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
-endif
+let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+set termguicolors
 
 if $COLORTERM == 'gnome-terminal'
   set term=gnome-256color
@@ -193,6 +177,13 @@ set backupcopy=yes
 
 " shortcut for theme change
 nnoremap <F9> :colorscheme molokai \| set background=dark<CR>
-nnoremap <F10> :colorscheme PaperColor \| set background=light<CR>
+nnoremap <F10> :colorscheme gruvbox \| set background=light<CR>
+
+" colorscheme
+let g:gruvbox_contrast_dark = 'hard'
+let g:gruvbox_contrast_light = 'hard'
+let g:srcery_italic = 1
+
 
-colorscheme molokai
+" colorscheme molokai
+colorscheme gruvbox

M vimconfigbase.vim → vimconfigbase.vim

@@ -39,3 +39,6 @@ " colorscheme torte
 set background=dark
 hi statusline ctermfg=234 ctermbg=250
 hi LineNr ctermfg=246
+
+" toggle for paste mode
+set pastetoggle=<F3>