Browse Source

big changes

Chrisatmachine 6 years ago
parent
commit
f7ae5753ea
3 changed files with 147 additions and 29 deletions
  1. 93 20
      init.vim
  2. 4 0
      setupDEB.sh
  3. 50 9
      tags

+ 93 - 20
init.vim

@@ -7,6 +7,7 @@ set mouse=a
 set splitbelow
 set splitright
 set t_Co=256
+set autochdir
 " escape can blow me
 nnoremap <C-c> <Esc>
 " Set Proper Tabs
@@ -26,7 +27,8 @@ nnoremap <F9> :vsplit<CR>
 nnoremap <F10> :split<CR>
 nnoremap <F12> :only<CR>
 nnoremap <F2> :BuffergatorToggle<CR>
-nnoremap <F3> :SyntasticCheck<CR>
+nnoremap <F3> :Files<CR>
+nnoremap <F1> :10split term://bash<CR> 
 
 " Be iMproved
 if &compatible
@@ -56,7 +58,9 @@ if get(g:, 'elite_mode')
 	nnoremap <Left>  :vertical resize -2<CR>
 	nnoremap <Right> :vertical resize +2<CR>
 endif
-
+nnoremap <TAB> :bnext<CR>
+nnoremap <S-TAB> :bprevious<CR>
+let mapleader = ","
 """""""""" END HOUSEKEEPING """"""""""
 
 """""""""" PLUGINS """"""""""
@@ -88,6 +92,7 @@ if dein#load_state('~/chris/.cache/dein')
   call dein#add('liuchengxu/space-vim-dark')
   call dein#add('nightsense/stellarized')
   call dein#add('vim-airline/vim-airline')
+  "call dein#add('itchyny/lightline.vim')
   call dein#add('vim-airline/vim-airline-themes')
   call dein#add('chriskempson/base16-vim')
   " Auto Pairs
@@ -108,12 +113,12 @@ if dein#load_state('~/chris/.cache/dein')
   call dein#add('terryma/vim-multiple-cursors')
   " NERDTree
   call dein#add('scrooloose/nerdtree')
+  call dein#add('scrooloose/nerdcommenter')
   " FZF
   call dein#add('junegunn/fzf.vim')
   call dein#add('junegunn/fzf')
   " BufOnly use :BufOnly to unload all or pass it a single buffer
   call dein#add('vim-scripts/BufOnly.vim')
-
   " For autocomplete
   call dein#add('zchee/deoplete-jedi')
   call dein#add('Shougo/deoplete.nvim')
@@ -151,23 +156,87 @@ if strftime('%H') >= 7 && strftime('%H') < 8
   set background=light
   colorscheme stellarized
 else
-  let g:airline_theme='violet'
   set background=dark
   colorscheme space-vim-dark
 
-" Range:   233 (darkest) ~ 238 (lightest)
-" Default: 235
-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
-let g:airline#extensions#tabline#enabled = 1
-let g:airline_powerline_fonts = 1 
-let g:hybrid_custom_term_colors = 1
-if !exists('g:airline_symbols')
-  let g:airline_symbols = {}
-endif
-let g:airline_symbols.space = "\ua0"
+  " Range:   233 (darkest) ~ 238 (lightest)
+  " Default: 235
+  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
+  if !empty(glob("/usr/lib/rpm/redhat"))
+    "Lightline
+    if !exists('g:airline_symbols')
+    let g:airline_symbols = {}
+  endif
+
+  " unicode symbols
+  let g:airline_left_sep = '»'
+  let g:airline_left_sep = '▶'
+  let g:airline_right_sep = '«'
+  let g:airline_right_sep = '◀'
+  let g:airline_symbols.crypt = '🔒'
+  let g:airline_symbols.linenr = '☰'
+  let g:airline_symbols.linenr = '␊'
+  let g:airline_symbols.linenr = '␤'
+  let g:airline_symbols.linenr = '¶'
+  let g:airline_symbols.maxlinenr = ''
+  let g:airline_symbols.maxlinenr = '㏑'
+  let g:airline_symbols.branch = '⎇'
+  let g:airline_symbols.paste = 'ρ'
+  let g:airline_symbols.paste = 'Þ'
+  let g:airline_symbols.paste = '∥'
+  let g:airline_symbols.spell = 'Ꞩ'
+  let g:airline_symbols.notexists = 'Ɇ'
+  let g:airline_symbols.whitespace = 'Ξ'
+
+  " powerline symbols
+  let g:airline_left_sep = ''
+  let g:airline_left_alt_sep = ''
+  let g:airline_right_sep = ''
+  let g:airline_right_alt_sep = ''
+  let g:airline_symbols.branch = ''
+  let g:airline_symbols.readonly = ''
+  let g:airline_symbols.linenr = '☰'
+  let g:airline_symbols.maxlinenr = ''
+
+  " old vim-powerline symbols
+  let g:airline_left_sep = '⮀'
+  let g:airline_left_alt_sep = '⮁'
+  let g:airline_right_sep = '⮂'
+  let g:airline_right_alt_sep = '⮃'
+  let g:airline_symbols.branch = '⭠'
+  let g:airline_symbols.readonly = '⭤'
+  let g:airline_symbols.linenr = '⭡'
+
+    "let g:loaded_airline = 1
+    "set showtabline=2
+    "set noshowmode
+    "let g:lightline = {
+    "  \ 'colorscheme': 'jellybeans',
+    "  \ 'active': {
+    "  \   'left': [['mode', 'paste'],
+    "  \           ['gitbranch', 'readonly', 'filename', 'modified'] ]
+    "  \ },
+    "  \ 'component_function': {
+    "  \   'gitbranch': 'fugitive#head'
+    " \ },
+    "  \ }
+  else
+
+    "Airline
+    set noshowmode
+    autocmd VimEnter AirlineRefresh
+    let g:airline_theme='violet'
+    let g:airline#extensions#tabline#enabled = 1
+    let g:airline_powerline_fonts = 1 
+    let g:hybrid_custom_term_colors = 1
+    if !exists('g:airline_symbols')
+      let g:airline_symbols = {}
+      let g:airline_symbols.space = "\ua0"
+    endif
+  endif
 endif
 " Enable highlighting of the current line
 set cursorline
@@ -205,7 +274,6 @@ let g:ctrlp_cmd = 'CtrlP'
 
 " MULTI CURSOR
 let g:multi_cursor_use_default_mapping=0
-
 " Default mapping
 let g:multi_cursor_start_word_key      = '<C-n>'
 let g:multi_cursor_select_all_word_key = '<A-n>'
@@ -219,14 +287,19 @@ let g:multi_cursor_quit_key            = '<Esc>'
 " ALE
 let g:ale_linters = {
     \ 'cpp' : ['gcc'],
-    \ 'c' : ['gcc']
+    \ 'c' : ['gcc'],
+    \ 'vim' : ['vint']
     \}
 let g:ale_cpp_gcc_options='-Wall -Wextra'
 let g:ale_c_gcc_options='-Wall -Wextra'
+let g:ale_vim_vint_executable = 'vint'
+let g:ale_vim_vint_show_style_issues = 1
+map <leader>a :ALEToggle<CR>
 
 " Python
-if !empty(glob("/bin/python3.6"))
+if !empty(glob("/usr/lib/rpm/redhat"))
     " For RHEL
+    let g:chromatica#libclang_path='/usr/lib64/llvm'
     let g:python3_host_prog = '/bin/python3.6'
 else
     " For Debian based   

+ 4 - 0
setupDEB.sh

@@ -14,3 +14,7 @@ curl https://raw.githubusercontent.com/Shougo/dein.vim/master/bin/installer.sh >
 
 # run installer
 sh ./installer.sh ~/.cache/dein
+
+git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
+
+~/.fzf/install

+ 50 - 9
tags

@@ -16,8 +16,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
+<F1>	init.vim	/^nnoremap <F1> :10split term:\/\/bash<CR> $/;"	m
 <F2>	init.vim	/^nnoremap <F2> :BuffergatorToggle<CR>$/;"	m
-<F3>	init.vim	/^nnoremap <F3> :SyntasticCheck<CR>$/;"	m
+<F3>	init.vim	/^nnoremap <F3> :Files<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
@@ -26,26 +27,65 @@
 <F9>	init.vim	/^nnoremap <F9> :vsplit<CR>$/;"	m
 <Left>	init.vim	/^	nnoremap <Left>  :vertical resize -2<CR>$/;"	m
 <Right>	init.vim	/^	nnoremap <Right> :vertical resize +2<CR>$/;"	m
+<S-TAB>	init.vim	/^nnoremap <S-TAB> :bprevious<CR>$/;"	m
 <TAB>	init.vim	/^inoremap <expr><TAB> pumvisible() ? "\\<C-n>" : "\\<TAB>"$/;"	m
+<TAB>	init.vim	/^nnoremap <TAB> :bnext<CR>$/;"	m
 <Up>	init.vim	/^	nnoremap <Up>    :resize -2<CR>$/;"	m
+<leader>a	init.vim	/^map <leader>a :ALEToggle<CR>$/;"	m
 NERDTreeShowHidden	init.vim	/^let NERDTreeShowHidden = 1$/;"	v
-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_symbols	init.vim	/^  let g:airline_symbols = {}$/;"	v
-g:airline_symbols	init.vim	/^let g:airline_symbols.space = "\\ua0"$/;"	v
-g:airline_theme	init.vim	/^  let g:airline_theme='violet'$/;"	v
+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_left_alt_sep	init.vim	/^  let g:airline_left_alt_sep = '⮁'$/;"	v
+g:airline_left_alt_sep	init.vim	/^  let g:airline_left_alt_sep = ''$/;"	v
+g:airline_left_sep	init.vim	/^  let g:airline_left_sep = '»'$/;"	v
+g:airline_left_sep	init.vim	/^  let g:airline_left_sep = '▶'$/;"	v
+g:airline_left_sep	init.vim	/^  let g:airline_left_sep = '⮀'$/;"	v
+g:airline_left_sep	init.vim	/^  let g:airline_left_sep = ''$/;"	v
+g:airline_powerline_fonts	init.vim	/^    let g:airline_powerline_fonts = 1 $/;"	v
+g:airline_right_alt_sep	init.vim	/^  let g:airline_right_alt_sep = '⮃'$/;"	v
+g:airline_right_alt_sep	init.vim	/^  let g:airline_right_alt_sep = ''$/;"	v
+g:airline_right_sep	init.vim	/^  let g:airline_right_sep = '«'$/;"	v
+g:airline_right_sep	init.vim	/^  let g:airline_right_sep = '◀'$/;"	v
+g:airline_right_sep	init.vim	/^  let g:airline_right_sep = '⮂'$/;"	v
+g:airline_right_sep	init.vim	/^  let g:airline_right_sep = ''$/;"	v
+g:airline_symbols	init.vim	/^      let g:airline_symbols = {}$/;"	v
+g:airline_symbols	init.vim	/^      let g:airline_symbols.space = "\\ua0"$/;"	v
+g:airline_symbols	init.vim	/^    let g:airline_symbols = {}$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.branch = '⎇'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.branch = '⭠'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.branch = ''$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.crypt = '🔒'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.linenr = '¶'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.linenr = '␊'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.linenr = '␤'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.linenr = '☰'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.linenr = '⭡'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.maxlinenr = ''$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.maxlinenr = '㏑'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.maxlinenr = ''$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.notexists = 'Ɇ'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.paste = 'Þ'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.paste = 'ρ'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.paste = '∥'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.readonly = '⭤'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.readonly = ''$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.spell = 'Ꞩ'$/;"	v
+g:airline_symbols	init.vim	/^  let g:airline_symbols.whitespace = 'Ξ'$/;"	v
+g:airline_theme	init.vim	/^    let g:airline_theme='violet'$/;"	v
 g:ale_c_gcc_options	init.vim	/^let g:ale_c_gcc_options='-Wall -Wextra'$/;"	v
 g:ale_cpp_gcc_options	init.vim	/^let g:ale_cpp_gcc_options='-Wall -Wextra'$/;"	v
 g:ale_linters	init.vim	/^let g:ale_linters = {$/;"	v
+g:ale_vim_vint_executable	init.vim	/^let g:ale_vim_vint_executable = 'vint'$/;"	v
+g:ale_vim_vint_show_style_issues	init.vim	/^let g:ale_vim_vint_show_style_issues = 1$/;"	v
 g:chromatica#enable_at_startup	init.vim	/^let g:chromatica#enable_at_startup=1$/;"	v
+g:chromatica#libclang_path	init.vim	/^    let g:chromatica#libclang_path='\/usr\/lib64\/llvm'$/;"	v
 g:chromatica#libclang_path	init.vim	/^    let g:chromatica#libclang_path='\/usr\/lib\/llvm-6.0\/lib'$/;"	v
 g:chromatica#responsive_mode	init.vim	/^let g:chromatica#responsive_mode=1$/;"	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:hybrid_custom_term_colors	init.vim	/^    let g:hybrid_custom_term_colors = 1$/;"	v
 g:multi_cursor_next_key	init.vim	/^let g:multi_cursor_next_key            = '<C-n>'$/;"	v
 g:multi_cursor_prev_key	init.vim	/^let g:multi_cursor_prev_key            = '<C-p>'$/;"	v
 g:multi_cursor_quit_key	init.vim	/^let g:multi_cursor_quit_key            = '<Esc>'$/;"	v
@@ -58,6 +98,7 @@ g:multi_cursor_use_default_mapping	init.vim	/^let g:multi_cursor_use_default_map
 g:neosnippet#enable_completed_snippet	init.vim	/^let g:neosnippet#enable_completed_snippet = 1$/;"	v
 g:python3_host_prog	init.vim	/^    let g:python3_host_prog = '\/bin\/python3.6'$/;"	v
 g:python3_host_prog	init.vim	/^    let g:python3_host_prog = '\/usr\/bin\/python3.6'$/;"	v
-g:space_vim_dark_background	init.vim	/^let g:space_vim_dark_background = 233$/;"	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
+mapleader	init.vim	/^let mapleader = ","$/;"	v
 nvim	README.md	/^# nvim$/;"	c