summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fish/.config/fish/fish_variables2
-rw-r--r--vim/.vim/messages.log2
-rw-r--r--vim/.vimrc7
3 files changed, 9 insertions, 2 deletions
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
index ea31b73..904ee8b 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/go/bin\x1e/home/sophie/\x2ecargo/bin\x1e/usr/sbin\x1e/sbin
+SETUVAR --export fish_user_paths:/home/sophie/\x2elocal/bin/\x1efish_user_paths
diff --git a/vim/.vim/messages.log b/vim/.vim/messages.log
new file mode 100644
index 0000000..fb3279b
--- /dev/null
+++ b/vim/.vim/messages.log
@@ -0,0 +1,2 @@
+Messages maintainer: The Vim Project
+"uses.html" 174L, 5613B
diff --git a/vim/.vimrc b/vim/.vimrc
index 45268aa..7ee6530 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -16,6 +16,7 @@ Plug 'tpope/vim-commentary'
Plug 'yegappan/lsp'
Plug 'mattn/vim-lsp-settings'
Plug 'normen/vim-lsp-settings-adapter'
+Plug 'dense-analysis/ale'
Plug 'kalbasit/vim-colemak'
call plug#end()
let mapleader = "\<Space>"
@@ -62,6 +63,10 @@ nnoremap <leader>c "+y
vnoremap <leader>c "+y
autocmd FileType html,css EmmetInstall
"let
+let g:ale_linters = {'vim': ['vint']}
+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:buftabline_show = 2
let g:buftabline_numbers = 1
@@ -111,7 +116,7 @@ function! s:lsp_keymaps() abort
nmap <buffer> [g :LspDiagPrev<CR>
nmap <buffer> ]g :LspDiagNext<CR>
nmap <buffer> K :LspHover<CR>
- if &filetype !=# 'vim'
+ if index(['vim', 'html', 'css'], &filetype) == -1
autocmd BufWritePre <buffer> LspFormat
endif
endfunction