penguincoder
/
bare-dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update vimrc

master
Andrew Coleman 2020-11-19 10:46:26 -05:00
parent c0583c0fee
commit c6bf4e9bc0
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.vimrc
View File

@ -20,6 +20,8 @@ Plug 'airblade/vim-gitgutter'
Plug 'elixir-editors/vim-elixir' Plug 'elixir-editors/vim-elixir'
Plug 'leafgarland/typescript-vim' Plug 'leafgarland/typescript-vim'
Plug 'jlanzarotta/bufexplorer' Plug 'jlanzarotta/bufexplorer'
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
set nocompatible set nocompatible
set history=1000 set history=1000
@ -40,6 +42,7 @@ set noshowmode
set hlsearch set hlsearch
set incsearch set incsearch
syntax on syntax on
let mapleader = " "
filetype on filetype on
filetype plugin on filetype plugin on
@ -57,7 +60,9 @@ autocmd BufNewFile,BufRead *.tera set syntax=django
nmap n nzz nmap n nzz
nmap N Nzz nmap N Nzz
let g:lightline = {} let g:lightline = {
\ 'colorscheme': 'OldHope',
\ }
let g:lightline.component = { let g:lightline.component = {
\ 'readonly': '%{&readonly?"":""}', \ 'readonly': '%{&readonly?"":""}',
@ -114,9 +119,9 @@ autocmd InsertLeave * match ExtraWhitespace /\s\+$/
autocmd BufWinLeave * call clearmatches() autocmd BufWinLeave * call clearmatches()
" shortcuts for 3-way merge " shortcuts for 3-way merge
map <Leader>1 :diffget LOCAL<CR> " map <Leader>1 :diffget LOCAL<CR>
map <Leader>2 :diffget BASE<CR> " map <Leader>2 :diffget BASE<CR>
map <Leader>3 :diffget REMOTE<CR> " map <Leader>3 :diffget REMOTE<CR>
" packloadall " packloadall
" silent! helptags ALL " silent! helptags ALL
@ -132,4 +137,12 @@ nmap ga <Plug>(EasyAlign)
nnoremap <silent><leader>1 :source ~/.vimrc \| :PlugInstall<CR> nnoremap <silent><leader>1 :source ~/.vimrc \| :PlugInstall<CR>
map <Leader>s :StripWhitespace<CR> map <Leader>s :StripWhitespace<CR>
nnoremap <leader>f :GFiles<CR>
nnoremap <leader>g :Rg<CR>
nnoremap <silent><leader>l :Buffers<CR>
if !has('gui_running')
set t_Co=256
endif
call plug#end() call plug#end()