Chrisatmachine 7 лет назад
Родитель
Сommit
2732148e62
2 измененных файлов с 79 добавлено и 11 удалено
  1. 68 11
      init.vim
  2. 11 0
      tags

+ 68 - 11
init.vim

@@ -5,8 +5,17 @@ syntax on
 set nowrap
 set encoding=utf8
 set mouse=a
+set splitbelow
+set splitright
 " escape can blow me
 nnoremap <C-c> <Esc>
+" Set Proper Tabs
+set tabstop=4
+set shiftwidth=4
+set smarttab
+set expandtab
+" Always display the status line
+set laststatus=2
 " Gets rid of highlights after search
 nnoremap <silent> <F7> :nohlsearch<CR><F7>
 " Line numbers
@@ -16,6 +25,8 @@ nnoremap <F6> :set nonumber!<CR>
 nnoremap <F9> :vsplit<CR>
 nnoremap <F10> :split<CR>
 nnoremap <F12> :only<CR>
+nnoremap <F2> :BuffergatorToggle<CR>
+nnoremap <F3> :SyntasticCheck<CR>
 "if (has("termguicolors"))
 "  set termguicolors
 "endif
@@ -78,8 +89,21 @@ if dein#load_state('~/chris/.cache/dein')
   call dein#add('Shougo/neosnippet-snippets')
   " Themes
   call dein#add('liuchengxu/space-vim-dark')
+  call dein#add('nightsense/stellarized')
+  call dein#add('vim-airline/vim-airline')
+  call dein#add('vim-airline/vim-airline-themes')
+  call dein#add('chriskempson/base16-vim')
   " Auto Pairs
   call dein#add('jiangmiao/auto-pairs')
+  " Buffergator use \b
+  call dein#add('jeetsukumaran/vim-buffergator')
+  " Ctrlp 
+  call dein#add('ctrlpvim/ctrlp.vim')
+  " Searchtasks searches for TODO, FIXME, XXX and such run :SearchTasks . 
+  call dein#add('gilsondev/searchtasks.vim')
+  " Syntax 
+  "call dein#add('vim-syntastic/syntastic')
+"  call dein#add('w0rp/ale')
   " NERDTree
   call dein#add('scrooloose/nerdtree')
   " BufOnly use :BufOnly to unload all or pass it a single buffer
@@ -109,12 +133,20 @@ if dein#check_install()
   call dein#install()
 endif
 
+let g:deoplete#enable_at_startup = 1
 """""""""" END PLUGINS """"""""""
 
 """""""""" SPACEVIM THEME """"""""""
 
 " Set theme
-colorscheme space-vim-dark
+if strftime('%H') >= 7 && strftime('%H') < 10 
+  set background=light
+  colorscheme stellarized
+else
+  let g:airline_theme='violet'
+  set background=dark
+  "colorscheme stellarized
+  colorscheme space-vim-dark
 
 " Terminal Transparency
 "if $TERM_PROGRAM =~ 'terminator'
@@ -128,12 +160,17 @@ colorscheme space-vim-dark
 let g:space_vim_dark_background = 233
 color space-vim-dark
 hi Comment guifg=#5C6370 ctermfg=59
+let base16colorspace=256  " Access colors present in 256 colorspace
 "hi Comment cterm=italic
 "set background=dark
 "set termguicolors
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_powerline_fonts = 1 
+let g:hybrid_custom_term_colors = 1
+
+endif
 " Enable highlighting of the current line
 set cursorline
-
 """""""""" END THEME """"""""""
 
 """""""""" BEGIN CONFIGS """"""""""
@@ -142,20 +179,40 @@ set cursorline
 let g:deoplete#enable_at_startup = 1
 " Startify
 let g:startify_custom_header = [                                                                                                                                                                                 
-                \ '                                ',                                                                                                                                            
-                \ '            __                  ',                                                                                                                                            
-                \ '    __  __ /\_\    ___ ___      ',                                                                                                                                            
-                \ '   /\ \/\ \\/\ \ /'' __` __`\   ',                                                                                                                                            
-                \ '   \ \ \_/ |\ \ \/\ \/\ \/\ \   ',                                                                                                                                            
-                \ '    \ \___/  \ \_\ \_\ \_\ \_\  ',                                                                                                                                            
-                \ '     \/__/    \/_/\/_/\/_/\/_/  ',                                                                                                                                            
-                \ ]
+	\ '     _   __                _         ',
+	\ '    / | / /__  ____ _   __(_)___ ___ ',
+	\ '   /  |/ / _ \/ __ \ | / / / __ `__ \',
+	\ '  / /|  /  __/ /_/ / |/ / / / / / / /',
+	\ ' /_/ |_/\___/\____/|___/_/_/ /_/ /_/ ']
 
+let g:syntastic_cpp_config_file='.syntastic_cpp_config'
 " Tagbar
 nmap <F8> :TagbarToggle<CR>
 " NERDTree
 nmap <F5> :NERDTreeToggle<CR>
-
+" SearchTasks
+nmap <F4> :SearchTasks *<CR>
+" Syntastic
+"set statusline+=%#warningmsg#
+"set statusline+=%{SyntasticStatuslineFlag()}
+"set statusline+=%*
+
+"let g:syntastic_always_populate_loc_list = 1
+"let g:syntastic_auto_loc_list = 1
+"let g:syntastic_check_on_open = 1
+"let g:syntastic_check_on_wq = 0
+"let g:syntastic_cpp_check_header = 1
+"let g:syntastic_cpp_auto_refresh_includes = 1
+"let g:syntastic_ignore_files = ['\m^/usr/include/', '\m\c\.h$']
 """""""""" END CONFIGS """"""""""
 
+" Ctrlp
+let g:ctrlp_map = '<c-p>'
+let g:ctrlp_cmd = 'CtrlP'
+
 "TODO figure out cscope
+"TODO get my function keys sorted
+"TODO create function key section
+"TODO SYNTAX CHECKING
+
+let g:deoplete#enable_at_startup = 1

+ 11 - 0
tags

@@ -13,6 +13,9 @@
 <Down>	init.vim	/^	nnoremap <Down>  :resize +2<CR>$/;"	m
 <F10>	init.vim	/^nnoremap <F10> :split<CR>$/;"	m
 <F12>	init.vim	/^nnoremap <F12> :only<CR>$/;"	m
+<F2>	init.vim	/^nnoremap <F2> :BuffergatorToggle<CR>$/;"	m
+<F3>	init.vim	/^nnoremap <F3> :SyntasticCheck<CR>$/;"	m
+<F4>	init.vim	/^nmap <F4> :SearchTasks *<CR>$/;"	m
 <F5>	init.vim	/^nmap <F5> :NERDTreeToggle<CR>$/;"	m
 <F6>	init.vim	/^nnoremap <F6> :set nonumber!<CR>$/;"	m
 <F7>	init.vim	/^nnoremap <silent> <F7> :nohlsearch<CR><F7>$/;"	m
@@ -22,8 +25,16 @@
 <Right>	init.vim	/^	nnoremap <Right> :vertical resize +2<CR>$/;"	m
 <TAB>	init.vim	/^inoremap <expr><TAB> pumvisible() ? "\\<C-n>" : "\\<TAB>"$/;"	m
 <Up>	init.vim	/^	nnoremap <Up>    :resize -2<CR>$/;"	m
+base16colorspace	init.vim	/^let base16colorspace=256  " Access colors present in 256 colorspace$/;"	v
+g:airline#extensions#tabline#enabled	init.vim	/^let g:airline#extensions#tabline#enabled = 1$/;"	v
+g:airline_powerline_fonts	init.vim	/^let g:airline_powerline_fonts = 1 $/;"	v
+g:airline_theme	init.vim	/^  let g:airline_theme='violet'$/;"	v
+g:ctrlp_cmd	init.vim	/^let g:ctrlp_cmd = 'CtrlP'$/;"	v
+g:ctrlp_map	init.vim	/^let g:ctrlp_map = '<c-p>'$/;"	v
 g:deoplete#enable_at_startup	init.vim	/^let g:deoplete#enable_at_startup = 1$/;"	v
 g:elite_mode	init.vim	/^let g:elite_mode=1$/;"	v
+g:hybrid_custom_term_colors	init.vim	/^let g:hybrid_custom_term_colors = 1$/;"	v
 g:space_vim_dark_background	init.vim	/^let g:space_vim_dark_background = 233$/;"	v
 g:startify_custom_header	init.vim	/^let g:startify_custom_header = [                                                                /;"	v
+g:syntastic_cpp_config_file	init.vim	/^let g:syntastic_cpp_config_file='.syntastic_cpp_config'$/;"	v
 nvim	README.md	/^# nvim$/;"	c