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 caad5fb..6a6d923 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 @@ -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,33 +181,46 @@ 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'], +\ 'javascript': ['eslint'], \ 'markdown': ['mdl', 'write-good'] \} let g:ale_fixers = { \ '*': ['remove_trailing_lines', 'trim_whitespace'], -\ 'javascript': ['eslint'], +\ 'python': ['yapf', 'black'], +\ 'javascript': ['prettier', 'eslint'], +\ 'css': ['prettier'], +\ 'html': ['prettier'], \ '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 let g:vim_markdown_no_default_key_mappings = 1 let g:vim_markdown_toc_autofit = 1 + +"vim-emmet +let g:user_emmet_leader_key = ',' "}}} -" 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 +242,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 +264,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" "}}} @@ -319,7 +332,7 @@ endfunction "}}} "filetype functions -"------------------{{{ +"{{{ function BashSettings() set syntax=sh endfunction @@ -337,10 +350,7 @@ endfunction function HtmlSettings() syntax sync fromstart endfunction -"}}} -"group functions -"-------------------------{{{ function SpellSettings() setlocal spell endfunction @@ -350,13 +360,6 @@ function HalftabSettings() endfunction "}}} -"syntax/filetype settings (just in case they haven't been set yet) -"{{{ -syntax on -filetype plugin indent on -runtime macros/matchit.vim -"}}} - "autocommands "{{{ if has("autocmd")