diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | init.vim | 4 | ||||
| -rw-r--r-- | modules/airline.vim | 4 | ||||
| -rw-r--r-- | modules/ctrlp.vim | 2 | ||||
| -rw-r--r-- | modules/deoplete.vim | 5 | ||||
| -rw-r--r-- | modules/general.vim | 86 | ||||
| -rw-r--r-- | modules/gutentags.vim | 1 | ||||
| -rw-r--r-- | modules/nerdtree.vim | 1 | ||||
| -rw-r--r-- | modules/plugins.vim | 22 | ||||
| -rw-r--r-- | modules/pythonpath.vim | 1 | ||||
| -rw-r--r-- | modules/startify.vim | 6 | ||||
| -rw-r--r-- | old/init.vim | 248 |
12 files changed, 128 insertions, 254 deletions
@@ -1,3 +1,3 @@ dein -tags +tags* .netrwhist @@ -1,6 +1,10 @@ " Activate Modules +source $HOME/.config/nvim/modules/pythonpath.vim source $HOME/.config/nvim/modules/plugins.vim source $HOME/.config/nvim/modules/general.vim source $HOME/.config/nvim/modules/theme.vim source $HOME/.config/nvim/modules/airline.vim source $HOME/.config/nvim/modules/deoplete.vim +source $HOME/.config/nvim/modules/nerdtree.vim +source $HOME/.config/nvim/modules/startify.vim +source $HOME/.config/nvim/modules/gutentags.vim diff --git a/modules/airline.vim b/modules/airline.vim index 0cebfd61..bf99c2eb 100644 --- a/modules/airline.vim +++ b/modules/airline.vim @@ -4,3 +4,7 @@ let g:airline#extensions#tabline#enabled = 1 let g:airline_powerline_fonts = 1 " Switch to your current theme let g:airline_theme = 'tender' +" Always show tabs +set showtabline=2 +" We don't need to see things like -- INSERT -- anymore +set noshowmode diff --git a/modules/ctrlp.vim b/modules/ctrlp.vim new file mode 100644 index 00000000..5d52cf01 --- /dev/null +++ b/modules/ctrlp.vim @@ -0,0 +1,2 @@ +let g:ctrlp_map = '<c-p>' +let g:ctrlp_cmd = 'CtrlP' diff --git a/modules/deoplete.vim b/modules/deoplete.vim index 3189451c..1774fa66 100644 --- a/modules/deoplete.vim +++ b/modules/deoplete.vim @@ -1,3 +1,4 @@ -let g:python3_host_prog = '~/Miniconda/envs/neovim/bin/python3.7' +" Enable deoplete let g:deoplete#enable_at_startup = 1 -let g:python3_host_prog = '~/Miniconda/envs/neovim/bin/python3.7' +" <TAB>: completion. +inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" diff --git a/modules/general.vim b/modules/general.vim index 23f7a85b..baf4cdaa 100644 --- a/modules/general.vim +++ b/modules/general.vim @@ -2,10 +2,90 @@ if &compatible set nocompatible endif - " Gives vim abilty to recognize filetypes filetype plugin indent on " Enables syntax highlighing syntax enable - -let g:python3_host_prog = '~/Miniconda/envs/neovim/bin/python3.7' +" display long lines as just one line +set nowrap +" The encoding displayed +set encoding=utf-8 +" The encoding written to file +set fileencoding=utf-8 +" Enable your mouse +set mouse=a +" Horizontal splits will automatically be below +set splitbelow +" Vertical splits will automatically be to the right +set splitright +" Support 256 colors +set t_Co=256 +" Your working directory will always be the same as your working directory +set autochdir +" Insert 4 spaces for a tab +set tabstop=4 +" Change the number of space characters inserted for indentation +set shiftwidth=4 +" Makes tabbing smarter will realize you have 2 vs 4 +set smarttab +" Converts tabs to spaces +set expandtab +" Makes indenting smart +set smartindent +" Good auto indent +set autoindent +" Always display the status line +set laststatus=2 +" Line numbers +set number +" Enable highlighting of the current line +set cursorline +let g:elite_mode=1 +" Disable arrow movement, resize splits instead. +if get(g:, 'elite_mode') + nnoremap <Up> :resize -2<CR> + nnoremap <Down> :resize +2<CR> + nnoremap <Left> :vertical resize -2<CR> + nnoremap <Right> :vertical resize +2<CR> +endif +" Alternate way to save +nnoremap <C-s> :w<CR> +" Alternate way to quit +nnoremap <C-Q> :wq!<CR> +" Use control-c instead of escape +nnoremap <C-c> <Esc> +" <TAB>: completion. +inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" +" F2 split vertical +nnoremap <F2> :vsplit<CR> +" F3 split horizontal +nnoremap <F3> :split<CR> +" Toggle Line numbers +nnoremap <F4> :set nonumber!<CR> +" Toggle NERDTree +nnoremap <F5> :NERDTreeToggle<CR> +" Get rid of highlights after search +nnoremap <silent> <F7> :nohlsearch<CR><F7> +" Open terminal with F1 +nnoremap <F1> :10split term://bash<CR> +" insert mode for terminal +autocmd BufWinEnter,WinEnter term://* startinsert +autocmd BufLeave term://* stopinsert +" Remap window switch +nnoremap <C-h> <C-w>h +nnoremap <C-j> <C-w>j +nnoremap <C-k> <C-w>k +nnoremap <C-l> <C-w>l +" Remap terminal switch +tnoremap <C-[> <C-\><C-n> +tnoremap <C-c><Esc> <Esc> +tnoremap <C-h> <C-\><C-n><C-w>h +tnoremap <C-j> <C-\><C-n><C-w>j +tnoremap <C-k> <C-\><C-n><C-w>k +tnoremap <C-l> <C-\><C-n><C-w>l +" TAB in general mode will mov to text buffer +nnoremap <TAB> :bnext<CR> +" SHIFT-TAB will go back +nnoremap <S-TAB> :bprevious<CR> +" Map leader switch to whatever you want +let mapleader = "," diff --git a/modules/gutentags.vim b/modules/gutentags.vim new file mode 100644 index 00000000..87ee153d --- /dev/null +++ b/modules/gutentags.vim @@ -0,0 +1 @@ +set nofsync diff --git a/modules/nerdtree.vim b/modules/nerdtree.vim new file mode 100644 index 00000000..e0ba7ea0 --- /dev/null +++ b/modules/nerdtree.vim @@ -0,0 +1 @@ +let NERDTreeShowHidden = 1 diff --git a/modules/plugins.vim b/modules/plugins.vim index 3f55a38c..299e169f 100644 --- a/modules/plugins.vim +++ b/modules/plugins.vim @@ -14,6 +14,27 @@ if dein#load_state('~/.config/nvim/dein') " powerline call dein#add('vim-airline/vim-airline') call dein#add('vim-airline/vim-airline-themes') + " File manager + call dein#add('scrooloose/NERDTree') + " Start Screen + call dein#add('mhinz/vim-startify') + " For ctags + call dein#add('ludovicchabant/vim-gutentags') + " Tagbar + call dein#add('majutsushi/tagbar') + " Auto Pairs + call dein#add('jiangmiao/auto-pairs') + " Buffergator use \b + call dein#add('jeetsukumaran/vim-buffergator') + " Ctrlp + call dein#add('ctrlpvim/ctrlp.vim') + "Syntax + call dein#add('w0rp/ale') + "Git + call dein#add('airblade/vim-gitgutter') + call dein#add('tpope/vim-fugitive') + " BufOnly use :BufOnly to unload all or pass it a single buffer + call dein#add('vim-scripts/BufOnly.vim') call dein#add('~/.config/nvim/dein/repos/github.com/Shougo/dein.vim') call dein#add('Shougo/deoplete.nvim') @@ -26,7 +47,6 @@ if dein#load_state('~/.config/nvim/dein') call dein#save_state() endif - " If you want to install not installed plugins on startup. if dein#check_install() call dein#install() diff --git a/modules/pythonpath.vim b/modules/pythonpath.vim new file mode 100644 index 00000000..b0607962 --- /dev/null +++ b/modules/pythonpath.vim @@ -0,0 +1 @@ +let g:python3_host_prog = expand('~/Miniconda/envs/neovim/bin/python3.7') diff --git a/modules/startify.vim b/modules/startify.vim new file mode 100644 index 00000000..46731681 --- /dev/null +++ b/modules/startify.vim @@ -0,0 +1,6 @@ +let g:startify_custom_header = [ + \ ' _ __ _ ', + \ ' / | / /__ ____ _ __(_)___ ___ ', + \ ' / |/ / _ \/ __ \ | / / / __ `__ \', + \ ' / /| / __/ /_/ / |/ / / / / / / /', + \ ' /_/ |_/\___/\____/|___/_/_/ /_/ /_/ '] diff --git a/old/init.vim b/old/init.vim index 946a7b0a..75fefbbd 100644 --- a/old/init.vim +++ b/old/init.vim @@ -1,138 +1,30 @@ -"""""""""" HOUSEKEEPING """""""""" -syntax on -set nowrap -set encoding=utf8 -set mouse=a -set splitbelow -set splitright -set t_Co=256 -set autochdir -" saving -nnoremap <C-s> :w<CR> -nnoremap <C-Q> :wq!<CR> -" 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 -set number -" Toggle line numbers -nnoremap <F1> :10split term://bash<CR> + nnoremap <F2> :BuffergatorToggle<CR> nnoremap <F3> :Files<CR> nnoremap <F4> :SearchTasks *<CR> -nnoremap <F5> :NERDTreeToggle<CR> -nnoremap <F6> :set nonumber!<CR> -nnoremap <silent> <F7> :nohlsearch<CR><F7> nnoremap <F8> :TagbarToggle<CR> -nnoremap <F9> :vsplit<CR> -nnoremap <F10> :split<CR> nnoremap <F12> :only<CR> -" insert mode for terminal -autocmd BufWinEnter,WinEnter term://* startinsert -autocmd BufLeave term://* stopinsert - -" Be iMproved -if &compatible - set nocompatible -endif - -" Remap window switch -nnoremap <C-h> <C-w>h -nnoremap <C-j> <C-w>j -nnoremap <C-k> <C-w>k -nnoremap <C-l> <C-w>l -" Remap terminal switch -tnoremap <C-[> <C-\><C-n> -tnoremap <C-c><Esc> <Esc> -tnoremap <C-h> <C-\><C-n><C-w>h -tnoremap <C-j> <C-\><C-n><C-w>j -tnoremap <C-k> <C-\><C-n><C-w>k -tnoremap <C-l> <C-\><C-n><C-w>l -" <TAB>: completion. -inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" -" Enable Elite mode, No ARRRROWWS!!!! -let g:elite_mode=1 -" Disable arrow movement, resize splits instead. -if get(g:, 'elite_mode') - nnoremap <Up> :resize -2<CR> - nnoremap <Down> :resize +2<CR> - 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 """""""""" -" Required: -set runtimepath+=~/.cache/dein/repos/github.com/Shougo/dein.vim - -" Required: -if dein#load_state('~/chris/.cache/dein') - call dein#begin('~/.cache/dein') - " Let dein manage dein - " Required: - call dein#add('~/.cache/dein/repos/github.com/Shougo/dein.vim') - " Start Screen - call dein#add('mhinz/vim-startify') " Search Index shows how many instances of searched term call dein#add('google/vim-searchindex') - " line indents - "call dein#add('Yggdroot/indentLine') - " Gutentags - call dein#add('ludovicchabant/vim-gutentags') "call dein#add('steffanc/cscopemaps.vim') "call dein#add('brookhong/cscope.vim') "call dein#add('vim-scripts/autoload_cscope.vim') - " Tagbar - call dein#add('majutsushi/tagbar') " Add or remove your plugins here: TODO call dein#add('Shougo/neosnippet.vim') 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('itchyny/lightline.vim') - 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('w0rp/ale') call dein#add('arakashic/chromatica.nvim') - "Git - call dein#add('airblade/vim-gitgutter') - call dein#add('tpope/vim-fugitive') " Multiple Cursors 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', { 'dir': '~/.fzf', 'do': './install --all' }) "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') @@ -144,152 +36,15 @@ if dein#load_state('~/chris/.cache/dein') call dein#add('prettier/vim-prettier', {'do': 'yarn install'}) " Auto flow call dein#add('wokalski/autocomplete-flow') - " For vim 8+ - if !has('nvim') - call dein#add('roxma/nvim-yarp') - call dein#add('roxma/vim-hug-neovim-rpc') - endif - " You can specify revision/branch/tag. call dein#add('Shougo/deol.nvim', { 'rev': '01203d4c9' }) - " Required: - call dein#end() - call dein#save_state() -endif - -" Required: -filetype plugin indent on -syntax enable - -" If you want to install not installed plugins on startup. -if dein#check_install() - call dein#install() -endif - -"""""""""" END PLUGINS """""""""" - -"""""""""" SPACEVIM THEME """""""""" - -" Set theme TODO kill this light theme -if strftime('%H') >= 7 && strftime('%H') < 7 - set background=light - colorscheme stellarized -else - 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 - 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 - 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 -"""""""""" END THEME """""""""" - -"""""""""" BEGIN CONFIGS """""""""" - -" Deoplete -let g:deoplete#enable_at_startup = 1 " NeoSnippet let g:neosnippet#enable_completed_snippet = 1 imap <C-k> <Plug>(neosnippet_expand_or_jump) smap <C-k> <Plug>(neosnippet_expand_or_jump) xmap <C-k> <Plug>(neosnippet_expand_target) -" Startify -let g:startify_custom_header = [ - \ ' _ __ _ ', - \ ' / | / /__ ____ _ __(_)___ ___ ', - \ ' / |/ / _ \/ __ \ | / / / __ `__ \', - \ ' / /| / __/ /_/ / |/ / / / / / / /', - \ ' /_/ |_/\___/\____/|___/_/_/ /_/ /_/ '] - -" Tagbar -"nmap <F8> :TagbarToggle<CR> -" NERDTree -"nmap <F5> :NERDTreeToggle<CR> let NERDTreeShowHidden = 1 -" SearchTasks -"nmap <F4> :SearchTasks *<CR> -"""""""""" END CONFIGS """""""""" - -" Ctrlp -let g:ctrlp_map = '<c-p>' -let g:ctrlp_cmd = 'CtrlP' " MULTI CURSOR let g:multi_cursor_use_default_mapping=0 @@ -329,7 +84,6 @@ let g:ale_vim_vint_executable = 'vint' let g:ale_vim_vint_show_style_issues = 1 map <leader>a :ALEToggle<CR> -" Python TODO change this to point to virtual env with nevim support if !empty(glob("/usr/lib/rpm/redhat")) " For RHEL "let g:chromatica#libclang_path='/usr/lib64/llvm' |