From 08e297e08acc6386411718d75e042f1a6bdfdf50 Mon Sep 17 00:00:00 2001 From: James Dixon Date: Fri, 23 Oct 2020 11:28:44 -0400 Subject: [PATCH 1/4] change background --- stow/vim/.vim/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stow/vim/.vim/vimrc b/stow/vim/.vim/vimrc index 4997a38..c157192 100644 --- a/stow/vim/.vim/vimrc +++ b/stow/vim/.vim/vimrc @@ -43,7 +43,7 @@ set autowrite set confirm "display -set background=light +set background=dark set number set wrap set foldmethod=marker From 80588655b191bcf9f7415cc9aef0e977318dc379 Mon Sep 17 00:00:00 2001 From: James Dixon Date: Fri, 23 Oct 2020 12:42:52 -0400 Subject: [PATCH 2/4] update colors in vim/tmux and linters for ALE --- stow/tmux/.tmux.conf | 2 +- stow/vim/.vim/vimrc | 43 +++++++++++++++++++------------------------ 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/stow/tmux/.tmux.conf b/stow/tmux/.tmux.conf index 1cc3e6d..cfb4c1a 100644 --- a/stow/tmux/.tmux.conf +++ b/stow/tmux/.tmux.conf @@ -15,7 +15,7 @@ set -sg escape-time 0 # set -g focus-events on # appearance -set -g status-style "bg=black fg=white,bold" +set -g status-style "bg=colour16 fg=white,bold" set -g window-status-current-style "fg=yellow,bold" # set -g status-bg black diff --git a/stow/vim/.vim/vimrc b/stow/vim/.vim/vimrc index c157192..bedc7ca 100644 --- a/stow/vim/.vim/vimrc +++ b/stow/vim/.vim/vimrc @@ -150,7 +150,7 @@ call plug#begin(pluginDir) "git Plug 'tpope/vim-fugitive' "visual - Plug 'flazz/vim-colorschemes' + "Plug 'flazz/vim-colorschemes' "linting Plug 'w0rp/ale' @@ -181,25 +181,26 @@ let g:netrw_usetab = 1 let g:netrw_browsex_viewer = "xdg-open" let g:NetrwIsOpen = 0 "for toggle function let g:netrw_nogx = 1 -nmap gx (openbrowser-smart-search) -vmap gx (openbrowser-smart-search) "ale let g:ale_linters = { -\ 'javascript': ['prettier', 'eslint'], +\ 'python': ['flake8', 'pylint'], +\ 'javascript': ['eslint'], \ 'markdown': ['mdl', 'write-good'] \} let g:ale_fixers = { \ '*': ['remove_trailing_lines', 'trim_whitespace'], -\ 'javascript': ['eslint'], +\ 'python': ['yapf', 'black'], +\ 'javascript': ['prettier', 'eslint'], \ 'markdown': ['prettier'] \} let g:ale_sign_error = '->' let g:ale_sign_warning = '--' let g:ale_lint_on_save = 1 -let g:ale_fix_on_save = 1 +let g:ale_fix_on_save_ignore = 1 +highlight clear SignColumn "vim-markdown let g:vim_markdown_folding_disabled = 1 @@ -207,7 +208,14 @@ let g:vim_markdown_no_default_key_mappings = 1 let g:vim_markdown_toc_autofit = 1 "}}} -" colorschemes +"syntax/filetype settings (just in case they haven't been set yet) +"{{{ +syntax on +filetype plugin indent on +runtime macros/matchit.vim +"}}} + +"colorschemes " {{{ " colorscheme 1989 " colorscheme PaperColor @@ -229,8 +237,6 @@ let g:vim_markdown_toc_autofit = 1 "leader key let mapleader=' ' -"normal/visual -"------------- "paste and search nnoremap :let @/ = "" nnoremap p :set invpaste @@ -253,10 +259,12 @@ nnoremap =j :%!python -m json.tool "plugin keybinds nnoremap e :call ToggleNetrw() +nmap gx (openbrowser-smart-search) +vmap gx (openbrowser-smart-search) nnoremap at :ALEToggle +nmap af (ale_fix) "insert mode -"----------- inoreabbrev #!! "#!/usr/bin/env" "}}} @@ -271,8 +279,6 @@ command! WQ wq command! Q1 q! "}}} -"general functions -"{{{ "toggle functions "{{{ function! ToggleColorColumn() @@ -321,7 +327,7 @@ endfunction "}}} "filetype functions -"------------------{{{ +"{{{ function BashSettings() set syntax=sh endfunction @@ -339,10 +345,7 @@ endfunction function HtmlSettings() syntax sync fromstart endfunction -"}}} -"group functions -"-------------------------{{{ function SpellSettings() setlocal spell endfunction @@ -351,14 +354,6 @@ function HalftabSettings() setlocal ts=2 sts=2 sw=2 expandtab endfunction "}}} -"}}} - -"syntax/filetype settings (just in case they haven't been set yet) -"{{{ -syntax on -filetype plugin indent on -runtime macros/matchit.vim -"}}} "autocommands "{{{ From 3039fa34a1c0f7adafab42a3a61bf058be26ca55 Mon Sep 17 00:00:00 2001 From: James Dixon Date: Fri, 23 Oct 2020 13:00:10 -0400 Subject: [PATCH 3/4] change ale fixers/colors --- stow/vim/.vim/vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stow/vim/.vim/vimrc b/stow/vim/.vim/vimrc index bedc7ca..4bc11bd 100644 --- a/stow/vim/.vim/vimrc +++ b/stow/vim/.vim/vimrc @@ -193,6 +193,8 @@ let g:ale_fixers = { \ '*': ['remove_trailing_lines', 'trim_whitespace'], \ 'python': ['yapf', 'black'], \ 'javascript': ['prettier', 'eslint'], +\ 'css': ['prettier'], +\ 'html': ['prettier'], \ 'markdown': ['prettier'] \} @@ -201,6 +203,7 @@ let g:ale_sign_warning = '--' let g:ale_lint_on_save = 1 let g:ale_fix_on_save_ignore = 1 highlight clear SignColumn +let g:ale_set_highlights = 0 "vim-markdown let g:vim_markdown_folding_disabled = 1 From c525d3a1bf8f5fae7385dd408497e302d7bb02d9 Mon Sep 17 00:00:00 2001 From: James Dixon Date: Fri, 23 Oct 2020 16:46:26 -0400 Subject: [PATCH 4/4] change emmet leader key --- stow/vim/.vim/vimrc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stow/vim/.vim/vimrc b/stow/vim/.vim/vimrc index 4bc11bd..6a6d923 100644 --- a/stow/vim/.vim/vimrc +++ b/stow/vim/.vim/vimrc @@ -184,7 +184,7 @@ let g:netrw_nogx = 1 "ale let g:ale_linters = { -\ 'python': ['flake8', 'pylint'], +\ 'python': ['flake8'], \ 'javascript': ['eslint'], \ 'markdown': ['mdl', 'write-good'] \} @@ -203,12 +203,14 @@ let g:ale_sign_warning = '--' let g:ale_lint_on_save = 1 let g:ale_fix_on_save_ignore = 1 highlight clear SignColumn -let g:ale_set_highlights = 0 "vim-markdown let g:vim_markdown_folding_disabled = 1 let g:vim_markdown_no_default_key_mappings = 1 let g:vim_markdown_toc_autofit = 1 + +"vim-emmet +let g:user_emmet_leader_key = ',' "}}} "syntax/filetype settings (just in case they haven't been set yet)