vimrc, vimplugrc: one fzf to rule them all
This commit is contained in:
		
							parent
							
								
									7ea408db84
								
							
						
					
					
						commit
						2460959bce
					
				
					 2 changed files with 28 additions and 22 deletions
				
			
		
							
								
								
									
										11
									
								
								vimplugrc
									
										
									
									
									
								
							
							
						
						
									
										11
									
								
								vimplugrc
									
										
									
									
									
								
							| 
						 | 
					@ -9,6 +9,7 @@ silent!call plug#begin(plugdir)
 | 
				
			||||||
Plug 'junegunn/vim-plug'
 | 
					Plug 'junegunn/vim-plug'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
" general plugins
 | 
					" general plugins
 | 
				
			||||||
 | 
					Plug 'junegunn/fzf.vim'
 | 
				
			||||||
Plug 'junegunn/vim-easy-align'
 | 
					Plug 'junegunn/vim-easy-align'
 | 
				
			||||||
Plug 'lifepillar/vim-solarized8'
 | 
					Plug 'lifepillar/vim-solarized8'
 | 
				
			||||||
Plug 'mhinz/vim-signify'
 | 
					Plug 'mhinz/vim-signify'
 | 
				
			||||||
| 
						 | 
					@ -17,6 +18,7 @@ Plug 'sheerun/vim-polyglot'
 | 
				
			||||||
Plug 'tpope/vim-commentary'
 | 
					Plug 'tpope/vim-commentary'
 | 
				
			||||||
Plug 'tpope/vim-fugitive'
 | 
					Plug 'tpope/vim-fugitive'
 | 
				
			||||||
Plug 'tpope/vim-rsi'
 | 
					Plug 'tpope/vim-rsi'
 | 
				
			||||||
 | 
					Plug 'tpope/vim-vinegar'
 | 
				
			||||||
Plug 'davidhalter/jedi-vim', {'for': 'python'}
 | 
					Plug 'davidhalter/jedi-vim', {'for': 'python'}
 | 
				
			||||||
Plug 'w0rp/ale', {'for': ['python', 'sh']}
 | 
					Plug 'w0rp/ale', {'for': ['python', 'sh']}
 | 
				
			||||||
Plug 'vimwiki/vimwiki', {'on': 'VimwikiIndex'}
 | 
					Plug 'vimwiki/vimwiki', {'on': 'VimwikiIndex'}
 | 
				
			||||||
| 
						 | 
					@ -30,14 +32,21 @@ let g:ale_python_flake8_executable = 'python2'
 | 
				
			||||||
xmap <Leader>a <Plug>(EasyAlign)
 | 
					xmap <Leader>a <Plug>(EasyAlign)
 | 
				
			||||||
nmap <Leader>a <Plug>(EasyAlign)
 | 
					nmap <Leader>a <Plug>(EasyAlign)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					" fzf
 | 
				
			||||||
 | 
					nmap <Leader>ff :Files<CR>
 | 
				
			||||||
 | 
					nmap <Leader>fg :GFiles<CR>
 | 
				
			||||||
 | 
					nmap <Leader>fb :Buffers<CR>
 | 
				
			||||||
 | 
					nmap <Leader>fl :Lines<CR>
 | 
				
			||||||
 | 
					nmap <Leader>ft :Filetypes<CR>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
" vimwiki
 | 
					" vimwiki
 | 
				
			||||||
let g:vimwiki_list = [{'path': '$HOME/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
 | 
					let g:vimwiki_list = [{'path': '$HOME/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
" color theme
 | 
					" color theme
 | 
				
			||||||
if $TERM !~ '^linux'
 | 
					if $TERM !~ '^linux'
 | 
				
			||||||
 | 
					    let &bg = "light"
 | 
				
			||||||
    let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
 | 
					    let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
 | 
				
			||||||
    let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
 | 
					    let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
 | 
				
			||||||
    let &bg = "light"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    let g:solarized_use16 = 1
 | 
					    let g:solarized_use16 = 1
 | 
				
			||||||
    let g:solarized_italics = 1
 | 
					    let g:solarized_italics = 1
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										39
									
								
								vimrc
									
										
									
									
									
								
							
							
						
						
									
										39
									
								
								vimrc
									
										
									
									
									
								
							| 
						 | 
					@ -9,9 +9,25 @@ set belloff=all colorcolumn=80 formatoptions+=j relativenumber breakindent
 | 
				
			||||||
set keymap=russian-jcukenwintype iminsert=0 imsearch=0
 | 
					set keymap=russian-jcukenwintype iminsert=0 imsearch=0
 | 
				
			||||||
set title titlestring=[%{hostname()}]\ %t\ -\ vim
 | 
					set title titlestring=[%{hostname()}]\ %t\ -\ vim
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					let g:netrw_liststyle = 1
 | 
				
			||||||
let g:sh_indent_case_labels = 1
 | 
					let g:sh_indent_case_labels = 1
 | 
				
			||||||
let g:netrw_liststyle = 3
 | 
					
 | 
				
			||||||
let g:netrw_banner = 0
 | 
					" mappings
 | 
				
			||||||
 | 
					map <Space> <NOP>
 | 
				
			||||||
 | 
					let mapleader="\<Space>"
 | 
				
			||||||
 | 
					noremap <F1> <Esc>
 | 
				
			||||||
 | 
					noremap! <F1> <Esc>
 | 
				
			||||||
 | 
					nnoremap <Leader>l :setlocal list!<CR>
 | 
				
			||||||
 | 
					nnoremap <Leader>c :setlocal cursorline!<CR>
 | 
				
			||||||
 | 
					nnoremap <Leader>w :setlocal wrap!<CR>
 | 
				
			||||||
 | 
					noremap <Leader>/ :noh<CR>
 | 
				
			||||||
 | 
					noremap <Leader>y "+y
 | 
				
			||||||
 | 
					noremap <Leader>d "+d
 | 
				
			||||||
 | 
					noremap <Leader>p "+p
 | 
				
			||||||
 | 
					noremap <Leader>P "+P
 | 
				
			||||||
 | 
					noremap q <NOP>
 | 
				
			||||||
 | 
					noremap! <C-@> <C-^>
 | 
				
			||||||
 | 
					noremap! <C-Space> <C-^>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
" plugins
 | 
					" plugins
 | 
				
			||||||
let plugrc = expand('$HOME/.vimplugrc')
 | 
					let plugrc = expand('$HOME/.vimplugrc')
 | 
				
			||||||
| 
						 | 
					@ -37,22 +53,3 @@ endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
syntax on
 | 
					syntax on
 | 
				
			||||||
filetype plugin on
 | 
					filetype plugin on
 | 
				
			||||||
 | 
					 | 
				
			||||||
map <Space> <NOP>
 | 
					 | 
				
			||||||
let mapleader="\<Space>"
 | 
					 | 
				
			||||||
noremap <F1> <Esc>
 | 
					 | 
				
			||||||
noremap! <F1> <Esc>
 | 
					 | 
				
			||||||
nnoremap <Leader>l :setlocal list!<CR>
 | 
					 | 
				
			||||||
nnoremap <Leader>c :setlocal cursorline!<CR>
 | 
					 | 
				
			||||||
nnoremap <Leader>w :setlocal wrap!<CR>
 | 
					 | 
				
			||||||
noremap <Leader>/ :noh<CR>
 | 
					 | 
				
			||||||
noremap <Leader>y "+y
 | 
					 | 
				
			||||||
noremap <Leader>d "+d
 | 
					 | 
				
			||||||
noremap <Leader>p "+p
 | 
					 | 
				
			||||||
noremap <Leader>P "+P
 | 
					 | 
				
			||||||
noremap q <NOP>
 | 
					 | 
				
			||||||
nnoremap <Leader>q :q<CR>
 | 
					 | 
				
			||||||
nnoremap <Leader>s :w<CR>
 | 
					 | 
				
			||||||
noremap <Leader>e :Explore<CR>
 | 
					 | 
				
			||||||
noremap! <C-@> <C-^>
 | 
					 | 
				
			||||||
noremap! <C-Space> <C-^>
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue