From f7ae5753ea0fc2a8e06dd0ec5b2c71d6696106fe Mon Sep 17 00:00:00 2001 From: Chrisatmachine Date: Thu, 23 Aug 2018 23:25:56 -0400 Subject: big changes --- init.vim | 113 +++++++++++++++++++++++++++++++++++++++++++++++++----------- setupDEB.sh | 4 +++ tags | 59 ++++++++++++++++++++++++++----- 3 files changed, 147 insertions(+), 29 deletions(-) diff --git a/init.vim b/init.vim index ea547f72..599e00c9 100644 --- a/init.vim +++ b/init.vim @@ -7,6 +7,7 @@ set mouse=a set splitbelow set splitright set t_Co=256 +set autochdir " escape can blow me nnoremap " Set Proper Tabs @@ -26,7 +27,8 @@ nnoremap :vsplit nnoremap :split nnoremap :only nnoremap :BuffergatorToggle -nnoremap :SyntasticCheck +nnoremap :Files +nnoremap :10split term://bash " Be iMproved if &compatible @@ -56,7 +58,9 @@ if get(g:, 'elite_mode') nnoremap :vertical resize -2 nnoremap :vertical resize +2 endif - +nnoremap :bnext +nnoremap :bprevious +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 = '' let g:multi_cursor_select_all_word_key = '' @@ -219,14 +287,19 @@ let g:multi_cursor_quit_key = '' " 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 a :ALEToggle " 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 diff --git a/setupDEB.sh b/setupDEB.sh index 4b743fb3..a0f20a00 100755 --- a/setupDEB.sh +++ b/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 diff --git a/tags b/tags index b2a38aa8..657b3953 100644 --- a/tags +++ b/tags @@ -16,8 +16,9 @@ init.vim /^ nnoremap :resize +2$/;" m init.vim /^nnoremap :split$/;" m init.vim /^nnoremap :only$/;" m + init.vim /^nnoremap :10split term:\/\/bash $/;" m init.vim /^nnoremap :BuffergatorToggle$/;" m - init.vim /^nnoremap :SyntasticCheck$/;" m + init.vim /^nnoremap :Files$/;" m init.vim /^nmap :SearchTasks *$/;" m init.vim /^nmap :NERDTreeToggle$/;" m init.vim /^nnoremap :set nonumber!$/;" m @@ -26,26 +27,65 @@ init.vim /^nnoremap :vsplit$/;" m init.vim /^ nnoremap :vertical resize -2$/;" m init.vim /^ nnoremap :vertical resize +2$/;" m + init.vim /^nnoremap :bprevious$/;" m init.vim /^inoremap pumvisible() ? "\\" : "\\"$/;" m + init.vim /^nnoremap :bnext$/;" m init.vim /^ nnoremap :resize -2$/;" m +a init.vim /^map a :ALEToggle$/;" 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 = ''$/;" 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 = ''$/;" v g:multi_cursor_prev_key init.vim /^let g:multi_cursor_prev_key = ''$/;" v g:multi_cursor_quit_key init.vim /^let g:multi_cursor_quit_key = ''$/;" 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 -- cgit v1.2.3