vim: big update
- removed unnecessary plugins - moved to lsp - added vimrc
This commit is contained in:
		
							parent
							
								
									4734cdd00b
								
							
						
					
					
						commit
						90b6fb2b80
					
				
					 5 changed files with 39 additions and 20 deletions
				
			
		
							
								
								
									
										10
									
								
								.config/nvim/.luarc.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								.config/nvim/.luarc.json
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,10 @@ | ||||||
|  | { | ||||||
|  |   "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json", | ||||||
|  |   "runtime.version": "LuaJIT", | ||||||
|  |   "Lua.format.defaultConfig": { | ||||||
|  |     "indent_style": "space", | ||||||
|  |     "indent_size": "2" | ||||||
|  |   }, | ||||||
|  |   "Lua.diagnostics.globals": ["vim" ] | ||||||
|  | } | ||||||
|  | 
 | ||||||
							
								
								
									
										17
									
								
								.config/nvim/init.lua
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								.config/nvim/init.lua
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,17 @@ | ||||||
|  | vim.o.termguicolors = true | ||||||
|  | vim.opt.runtimepath:append("~/.vim") | ||||||
|  | vim.opt.runtimepath:append("~/.vim/after") | ||||||
|  | vim.opt.packpath:append(vim.opt.runtimepath) | ||||||
|  | vim.cmd('source ~/.vimrc') | ||||||
|  | require("formatter").setup() | ||||||
|  | require("mason").setup() | ||||||
|  | require("mason-lspconfig").setup() | ||||||
|  | require("mason-lspconfig").setup_handlers { | ||||||
|  |     function (server_name) | ||||||
|  |         require("lspconfig")[server_name].setup{} | ||||||
|  |     end | ||||||
|  | } | ||||||
|  | local ok, _ = pcall(require, 'schtobia') | ||||||
|  | if not ok then | ||||||
|  |   print("No custom.lua found") | ||||||
|  | end | ||||||
|  | @ -1,4 +0,0 @@ | ||||||
| set termguicolors |  | ||||||
| set runtimepath^=~/.vim runtimepath+=~/.vim/after |  | ||||||
| let &packpath = &runtimepath |  | ||||||
| source ~/.vimrc |  | ||||||
|  | @ -1 +1 @@ | ||||||
| Subproject commit 0765c5c4f485fa111f190e2d7dd89ec9f5b3f554 | Subproject commit 5548a1a937d4e72606520c7484cd384e6c76b565 | ||||||
							
								
								
									
										26
									
								
								.vimrc
									
										
									
									
									
								
							
							
						
						
									
										26
									
								
								.vimrc
									
										
									
									
									
								
							|  | @ -13,33 +13,34 @@ call vundle#begin() | ||||||
|     Plugin 'APZelos/blamer.nvim' |     Plugin 'APZelos/blamer.nvim' | ||||||
|     Plugin 'airblade/vim-gitgutter' |     Plugin 'airblade/vim-gitgutter' | ||||||
|     Plugin 'Chiel92/vim-autoformat' |     Plugin 'Chiel92/vim-autoformat' | ||||||
|     Plugin 'deoplete-plugins/deoplete-docker' |  | ||||||
|     Plugin 'deoplete-plugins/deoplete-jedi' |  | ||||||
|     Plugin 'editorconfig/editorconfig-vim' |     Plugin 'editorconfig/editorconfig-vim' | ||||||
|     Plugin 'junegunn/fzf' |     Plugin 'junegunn/fzf' | ||||||
|     Plugin 'junegunn/fzf.vim' |     Plugin 'junegunn/fzf.vim' | ||||||
|     Plugin 'junegunn/goyo.vim' |     Plugin 'junegunn/goyo.vim' | ||||||
|     Plugin 'junegunn/limelight.vim' |     Plugin 'junegunn/limelight.vim' | ||||||
|     Plugin 'frankier/neovim-colors-solarized-truecolor-only' |     Plugin 'frankier/neovim-colors-solarized-truecolor-only' | ||||||
|     Plugin 'freitass/todo.txt-vim' |  | ||||||
|     Plugin 'itspriddle/vim-shellcheck' |  | ||||||
|     Plugin 'majutsushi/tagbar' |  | ||||||
|     Plugin 'mhinz/vim-startify' |     Plugin 'mhinz/vim-startify' | ||||||
|     Plugin 'preservim/nerdtree' |     Plugin 'preservim/nerdtree' | ||||||
|     Plugin 'sheerun/vim-polyglot' |     Plugin 'sheerun/vim-polyglot' | ||||||
|     Plugin 'Shougo/deoplete-clangx' |  | ||||||
|     Plugin 'Shougo/deoplete.nvim' |  | ||||||
|     Plugin 'Shougo/neoinclude.vim' |  | ||||||
|     Plugin 'tpope/vim-fugitive' |     Plugin 'tpope/vim-fugitive' | ||||||
|     Plugin 'tpope/vim-sleuth' |     Plugin 'tpope/vim-sleuth' | ||||||
|     Plugin 'vim-airline/vim-airline' |     Plugin 'vim-airline/vim-airline' | ||||||
|     Plugin 'vim-airline/vim-airline-themes' |     Plugin 'vim-airline/vim-airline-themes' | ||||||
|     Plugin 'wincent/terminus' |     Plugin 'wincent/terminus' | ||||||
|     Plugin 'wokalski/autocomplete-flow' |  | ||||||
|     Plugin 'Xuyuanp/nerdtree-git-plugin' |     Plugin 'Xuyuanp/nerdtree-git-plugin' | ||||||
|     if !has('nvim') |     if !has('nvim') | ||||||
|         Plugin 'roxma/nvim-yarp' |         Plugin 'roxma/nvim-yarp' | ||||||
|         Plugin 'roxma/vim-hug-neovim-rpc' |         Plugin 'roxma/vim-hug-neovim-rpc' | ||||||
|  |     else | ||||||
|  |         Plugin 'mfussenegger/nvim-dap' | ||||||
|  |         Plugin 'mfussenegger/nvim-lint' | ||||||
|  |         Plugin 'mhartington/formatter.nvim' | ||||||
|  |         Plugin 'nvim-neotest/nvim-nio' | ||||||
|  |         Plugin 'rcarriga/nvim-dap-ui' | ||||||
|  |         " the following order is important | ||||||
|  |         Plugin 'williamboman/mason.nvim' | ||||||
|  |         Plugin 'williamboman/mason-lspconfig.nvim' | ||||||
|  |         Plugin 'neovim/nvim-lspconfig' | ||||||
|     endif |     endif | ||||||
| call vundle#end() | call vundle#end() | ||||||
| 
 | 
 | ||||||
|  | @ -65,19 +66,16 @@ let g:airline_powerline_fonts = 1 | ||||||
| let g:airline_symbols.colnr = ' C' | let g:airline_symbols.colnr = ' C' | ||||||
| let g:airline_theme='solarized' | let g:airline_theme='solarized' | ||||||
| let g:airline#extensions#tabline#enabled = 1 | let g:airline#extensions#tabline#enabled = 1 | ||||||
|  | let g:blamer_enabled = 1 | ||||||
| let g:blamer_date_format = '%c' | let g:blamer_date_format = '%c' | ||||||
| let g:blamer_delay = 500 | let g:blamer_delay = 500 | ||||||
| let g:blamer_prefix = '   > ' | let g:blamer_prefix = '   > ' | ||||||
| let g:deoplete#enable_at_startup = 1 |  | ||||||
| let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-default/lib/libclang.so.1' |  | ||||||
| let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-default/lib/clang/default/include' |  | ||||||
| let g:gitgutter_highlight_lines = 1 | let g:gitgutter_highlight_lines = 1 | ||||||
| let g:gitgutter_highlight_linenrs = 1 | let g:gitgutter_highlight_linenrs = 1 | ||||||
| let g:goyo_width = 120 | let g:goyo_width = 120 | ||||||
| let g:startify_fortune_use_unicode = 1 | let g:startify_fortune_use_unicode = 1 | ||||||
| let g:startify_session_autoload = 1 | let g:startify_session_autoload = 1 | ||||||
| let g:startify_session_persistence = 1 | let g:startify_session_persistence = 1 | ||||||
| call deoplete#custom#var('omni', 'functions', {'lua': 'xolox#lua#omnifunc',}) |  | ||||||
| set encoding=utf-8 | set encoding=utf-8 | ||||||
| set icon | set icon | ||||||
| set smartcase | set smartcase | ||||||
|  | @ -96,7 +94,6 @@ set foldlevelstart=1 | ||||||
| set listchars=eol:¶,tab:\»\ ,trail:~,extends:>,precedes:<,nbsp:+ | set listchars=eol:¶,tab:\»\ ,trail:~,extends:>,precedes:<,nbsp:+ | ||||||
| set list | set list | ||||||
| set updatetime=750 | set updatetime=750 | ||||||
| set tags+=$HOME/.cache/cpp_tags |  | ||||||
| 
 | 
 | ||||||
| " Fast split/window navigation with <Ctrl-hjkl> | " Fast split/window navigation with <Ctrl-hjkl> | ||||||
| noremap <C-h> <C-w><C-h> | noremap <C-h> <C-w><C-h> | ||||||
|  | @ -120,7 +117,6 @@ nnoremap <F9> za | ||||||
| onoremap <F9> <C-C>za | onoremap <F9> <C-C>za | ||||||
| vnoremap <F9> zf | vnoremap <F9> zf | ||||||
| map <C-n> :NERDTreeToggle<CR> | map <C-n> :NERDTreeToggle<CR> | ||||||
| map <C-b> :TagbarToggle<CR> |  | ||||||
| nnoremap <Leader>b :BlamerToggle<CR> | nnoremap <Leader>b :BlamerToggle<CR> | ||||||
| nnoremap <Leader>g :Goyo<CR> | nnoremap <Leader>g :Goyo<CR> | ||||||
| nnoremap <Leader>l :Limelight!!<CR> | nnoremap <Leader>l :Limelight!!<CR> | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue