diff options
| -rw-r--r-- | fish/.config/fish/fish_variables | 2 | ||||
| -rw-r--r-- | vim/.vimrc | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index 904ee8b..be4c549 100644 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -29,4 +29,4 @@ SETUVAR fish_pager_color_description:yellow\x1e\x2di SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR --export fish_user_paths:/home/sophie/\x2elocal/bin/\x1efish_user_paths +SETUVAR --export fish_user_paths:/home/sophie/\x2elocal/bin\x1e/usr/sbin\x1e/sbin\x1e/home/sophie/go/bin/ @@ -26,7 +26,6 @@ filetype on filetype indent on filetype plugin on "set -set nocompatible set fileformat=unix set encoding=UTF-8 set number @@ -58,20 +57,23 @@ colorscheme flatwhite nnoremap <Space> <Nop> nnoremap <silent> <leader> :WhichKey '<Space>'<CR> inoremap <silent> <Esc> <Esc>l -nnoremap <nowait> y w nnoremap <leader>c "+y vnoremap <leader>c "+y "let let g:ale_linters = { \'vim': ['vint'], \'css': ['stylelint'], - \'html': ['htmlhint'], + \'html': ['tidy', 'htmlhint'], \'js': ['eslint'] \} +let g:ale_fixers = { + \'html': ['tidy'], + \} +let g:ale_html_tidy_options = '-indent -asxhtml -q ' let g:ale_sign_column_always = 1 let g:ale_lint_on_text_changed = 'normal' let g:ale_lint_on_save = 1 -let g:VM_maps = {} +let g:ale_fix_on_save = 1 let g:buftabline_show = 2 let g:buftabline_numbers = 1 let g:user_emmet_leader_key='<Space>' @@ -92,24 +94,22 @@ let g:which_key_map.b = { call which_key#register('<Space>', 'g:which_key_map') " lsp augroup lsp + autocmd! autocmd User LspSetup call LspOptionsSet(#{ \ autoComplete: v:true, \ autoHighlightDiags: v:true, - \ formatFallbck: v:false, + \ noNewlineCompletion: v:true, + \ formatFallback: v:false, \ }) autocmd User LspSetup call LspAddServer([ \ #{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']}, - \ ]) + \ #{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']}, + \]) + autocmd User LspAttached call s:lsp_keymaps() function! s:lsp_keymaps() abort |