diff options
Diffstat (limited to '.vimrc')
| -rw-r--r-- | .vimrc | 23 |
1 files changed, 8 insertions, 15 deletions
@@ -10,7 +10,7 @@ Plug 'tpope/vim-fugitive' Plug 'tpope/vim-rails', { 'for': 'ruby' } Plug 'tpope/vim-endwise', { 'for': 'ruby' } " Plug 'tpope/vim-surround' -" Plug 'tpope/vim-haml', { 'for': 'haml' } +Plug 'sheerun/vim-polyglot' Plug 'junegunn/gv.vim', { 'on': 'GV' } Plug 'junegunn/limelight.vim' Plug 'junegunn/goyo.vim', { 'on': 'Goyo' } @@ -24,30 +24,22 @@ Plug 'godlygeek/tabular' Plug 'SirVer/ultisnips' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' -Plug 'kchmck/vim-coffee-script', { 'for': 'coffee' } Plug 'airblade/vim-gitgutter' -Plug 'maksimr/vim-jsbeautify', { 'for': ['js', 'json', 'html', 'css', 'scss'] } Plug 'ngmy/vim-rubocop', { 'for': 'ruby' } -Plug 'elzr/vim-json', { 'for': ['js', 'json'] } -Plug 'yaymukund/vim-rabl', { 'for': 'rabl' } Plug 'honza/vim-snippets' Plug 'majutsushi/tagbar' Plug 'kkoomen/vim-doge' " Plug 'szw/vim-ctrlspace' -" Plug 'vim-ruby/vim-ruby' Plug 'nvie/vim-flake8', { 'for': 'python' } " Plug 'mustache/vim-mustache-handlebars' -" Plug 'diepm/vim-rest-console' " Plug 'mhinz/vim-startify' -Plug 'posva/vim-vue', { 'for': ['js', 'vue'] } -" Plug 'chr4/nginx.vim', { 'for': 'nginx' } Plug 'leafgarland/typescript-vim', { 'for': 'typescript' } Plug 'Quramy/tsuquyomi', { 'for': 'typescript' } Plug 'hashivim/vim-terraform', { 'for' : 'terraform' } Plug 'juliosueiras/vim-terraform-completion', { 'for' : 'terraform' } Plug 'prettier/vim-prettier', { \ 'do': 'yarn install', - \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'yaml', 'html'] } + \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'graphql', 'yaml', 'html'] } call plug#end() syntax on filetype plugin indent on @@ -88,6 +80,7 @@ set laststatus=2 " Always show the status line set ruler " Always show current position set showcmd " display incomplete commands set wildmenu " Turn on Wild menu +" set wildmode=list:longest,full set wildignore=*.o,*~,*.pyc " Ignore compiled files set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+ set undofile " Save undo's after file closes @@ -151,14 +144,10 @@ set omnifunc=pythoncomplete#Complete """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" autocmd BufNewFile,BufRead *.html.erb set filetype=html " for ruby erb template files autocmd BufNewFile,BufRead *.json.jbuilder set filetype=ruby " for ruby json template files +autocmd BufNewFile,BufRead,BufReadPost *.tsx set syntax=javascript " better tsx highlighting than polyglot defaults autocmd FileType markdown setlocal spell " spell check markdown files autocmd FileType gitcommit setlocal spell " spell check commits autocmd FileType ruby setlocal nospell " disable spell checking for ruby documentation -autocmd FileType javascript noremap <buffer> <c-f> :call JsBeautify()<cr> -autocmd FileType json noremap <buffer> <c-f> :call JsonBeautify()<cr> -autocmd FileType html noremap <buffer> <c-f> :call HtmlBeautify()<cr> -autocmd FileType css noremap <buffer> <c-f> :call CSSBeautify()<cr> -autocmd FileType scss noremap <buffer> <c-f> :call CSSBeautify()<cr> autocmd FileType typescript nmap <buffer> <Leader>t : <C-u>echo tsuquyomi#hint()<CR> autocmd FileType typescript setlocal completeopt+=preview @@ -180,6 +169,10 @@ let &colorcolumn="80,".join(range(121,130),",") "============= let g:ycm_python_binary_path = '/usr/local/bin/python3' +"polyglot" +"============= +" let g:polyglot_disabled = ['typescript'] + "NerdTree" "========= nnoremap <leader>nt :NERDTreeToggle<cr> |