diff --git a/vim/init.vim b/vim/init.vim index 83ea112..c426351 100644 --- a/vim/init.vim +++ b/vim/init.vim @@ -1,29 +1,24 @@ call plug#begin('~/.config/vim-plugins') -Plug 'ashfinal/vim-colors-paper' Plug 'junegunn/fzf' Plug 'junegunn/fzf.vim' +Plug 'mhinz/vim-signify' Plug 'rodjek/vim-puppet' Plug 'junegunn/goyo.vim' -Plug 'tpope/vim-fugitive' Plug 'dense-analysis/ale' Plug 'jiangmiao/auto-pairs' Plug 'frazrepo/vim-rainbow' -Plug 'edkolev/tmuxline.vim' Plug 'itchyny/lightline.vim' Plug 'airblade/vim-gitgutter' Plug 'junegunn/limelight.vim' Plug 'hashivim/vim-terraform' Plug 'bitc/vim-bad-whitespace' -Plug 'JamshedVesuna/vim-markdown-preview' -Plug 'mhinz/vim-signify' +Plug 'ashfinal/vim-colors-paper' call plug#end() set title set number set gdefault -set wildmenu set nobackup -set incsearch set expandtab set smartcase set splitbelow @@ -31,7 +26,6 @@ set splitright set ignorecase set nohlsearch set noshowmode -set autoindent set shiftround set cursorline set cursorcolumn @@ -41,12 +35,10 @@ set nowritebackup set bs=2 set tabstop=2 set scrolloff=5 -set laststatus=2 set shiftwidth=2 set showtabline=2 set softtabstop=2 set winminheight=0 -set backspace=eol,start,indent set matchpairs+=(:),{:},[:],<:>,':',":" nmap w @@ -62,26 +54,14 @@ map b :set cc=79 map nb :set cc=0 map n :set nonumber! map p :set paste! -map g :Gstatus -map gc :Gcommit -map gp :Gpush map f :Goyo map t :NERDTreeToggle -syntax on colorscheme paper -set background=dark set t_ZH= set t_ZR= hi Comment cterm=italic gui=italic hi BadWhitespace ctermbg=lightblue guibg=lightblue -if has("gui") - set guioptions-=e - set guioptions-=r - set guioptions-=L - set guifont=Hack\ Nerd\ Font\ Mono:h14 -endif -filetype plugin indent on autocmd! User GoyoEnter Limelight autocmd! User GoyoLeave Limelight! @@ -90,13 +70,11 @@ command! -bang -nargs=? -complete=dir Files let g:rainbow_active = 1 let g:terraform_fmt_on_save=1 -let vim_markdown_preview_github=1 -let vim_markdown_preview_hotkey='' let g:lightline = { \ 'colorscheme': 'powerlineish', \ 'active': { \ 'left': [ [ 'mode', 'paste' ], - \ [ 'fugitive', 'readonly', 'filename' ] ], + \ [ 'readonly', 'filename' ] ], \ 'right': [ [ 'lineinfo' ], \ [ 'percent' ], \ [ 'filetype' ] ]