diff options
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/.vim/.netrwhist | 14 | ||||
| -rw-r--r-- | vim/.vimrc | 39 |
2 files changed, 27 insertions, 26 deletions
diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist index 7d5ff8f..9278d2c 100644 --- a/vim/.vim/.netrwhist +++ b/vim/.vim/.netrwhist @@ -1,12 +1,12 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhistcnt =3 +let g:netrw_dirhistcnt =9 +let g:netrw_dirhist_9='/home/sophie/stow/xmonad/.config/xmonad' +let g:netrw_dirhist_8='/home/sophie/stow/xmonad/.config/xmonad/xmonad' +let g:netrw_dirhist_7='/home/sophie/stow/xmonad/.config/xmonad' +let g:netrw_dirhist_6='/home/sophie/stow/xmonad/.config/xmonad/xmonad' +let g:netrw_dirhist_5='/home/sophie/stow/xmonad/.config/xmonad' +let g:netrw_dirhist_4='/home/sophie/stow/xmonad/.config/xmonad/xmonad' let g:netrw_dirhist_3='/home/sophie/stow/jj/.config/jj/config.toml' let g:netrw_dirhist_2='/home/sophie/website' let g:netrw_dirhist_1='/home/sophie/stow/nano' let g:netrw_dirhist_0='/home/sophie/stow' -let g:netrw_dirhist_9='/home/sophie/stow/gram' -let g:netrw_dirhist_8='/home/sophie/stow' -let g:netrw_dirhist_7='/home/sophie/website' -let g:netrw_dirhist_6='/home/sophie/stow' -let g:netrw_dirhist_5='/home/sophie/website' -let g:netrw_dirhist_4='/home/sophie/stow/fish/.config/fish' @@ -1,6 +1,6 @@ if empty(glob('~/.vim/autoload/plug.vim')) - silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs - \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs + \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim endif call plug#begin('~/.vim/plugged') Plug 'itchyny/lightline.vim' @@ -83,22 +83,23 @@ let g:which_key_map.b = { call which_key#register('<Space>', 'g:which_key_map') " lsp autocmd User LspSetup call LspOptionsSet(#{ - \ autoComplete: v:true, - \ autoHighlightDiags: v:true, - \ formatFallbck: v:true, - \ }) + \ autoComplete: v:true, + \ autoHighlightDiags: v:true, + \ formatFallbck: v:false, + \ }) autocmd User LspSetup call LspAddServer([ - \ #{name: 'pylsp', filetype: 'python', path: 'pylsp'}, - \ #{name: 'clangd', filetype: ['c', 'cpp', 'objc', 'objcpp'], - \ path: 'clangd', args: ['--background-index']}, - \ #{name: 'html', filetype: 'html', - \ path: 'vscode-html-language-server', args: ['--stdio']}, - \ #{name: 'css', filetype: ['css', 'scss', 'less'], - \ path: 'vscode-css-language-server', args: ['--stdio']}, - \ #{name: 'ts', filetype: ['javascript', 'javascript.jsx', 'javascriptreact'], - \ path: 'typescript-language-server', args: ['--stdio']}, - \ ]) + \ #{name: 'hs', filetype: ['hs', 'lhs'], path: 'haskell-language-server-wrapper'}, + \ #{name: 'pylsp', filetype: 'python', path: 'pylsp'}, + \ #{name: 'clangd', filetype: ['c', 'cpp', 'objc', 'objcpp'], + \ path: 'clangd', args: ['--background-index']}, + \ #{name: 'html', filetype: 'html', + \ path: 'vscode-html-language-server', args: ['--stdio']}, + \ #{name: 'css', filetype: ['css', 'scss', 'less'], + \ path: 'vscode-css-language-server', args: ['--stdio']}, + \ #{name: 'ts', filetype: ['javascript', 'javascript.jsx', 'javascriptreact'], + \ path: 'typescript-language-server', args: ['--stdio']}, + \ ]) autocmd User LspAttached call s:lsp_keymaps() function! s:lsp_keymaps() abort @@ -110,7 +111,9 @@ function! s:lsp_keymaps() abort nmap <buffer> [g :LspDiagPrev<CR> nmap <buffer> ]g :LspDiagNext<CR> nmap <buffer> K :LspHover<CR> -autocmd BufWritePre <buffer> LspFormat + if &filetype !=# 'vim' + autocmd BufWritePre <buffer> LspFormat + endif endfunction function! s:prettier_format() abort if !executable('prettier') @@ -121,8 +124,6 @@ function! s:prettier_format() abort if v:shell_error silent undo echohl ErrorMsg | echom 'formatting failed' - else - silent! 1s/<!doctype html>/<!DOCTYPE html>/e endif call winrestview(l:view) endfunction |