diff --git a/.tmux.conf b/.tmux.conf index 0b716fe..11d9580 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -10,7 +10,11 @@ bind - split-window -v bind a last-window set -g history-limit 5000 +set -g default-terminal "alacritty" +set-option -ga terminal-overrides ",xterm-256color:Tc" + +set -g status-style 'bg=#181810' set -g status-bg black set -g status-fg white set -g status-justify centre diff --git a/.vimrc b/.vimrc index 79304ba..37ffaeb 100644 --- a/.vimrc +++ b/.vimrc @@ -12,6 +12,7 @@ set softtabstop=0 set textwidth=79 set signcolumn=yes set cursorline +set fo-=l fo+=rot syntax enable packadd matchit @@ -19,6 +20,18 @@ packadd matchit filetype plugin on filetype indent on +" Highlighiting fixes to avoid unreadable text +"highlight Folded term=standout ctermfg=3 ctermbg=256 +highlight Folded term=standout ctermfg=5 ctermbg=0 +highlight SignColumn ctermbg=8 +highlight Visual term=reverse ctermbg=7 ctermfg=1 guibg=LightGrey +hi SpellBad term=reverse ctermbg=1 ctermfg=7 gui=undercurl guisp=Red + +let g:EditorConfig_max_line_indicator = 'exceeding' +" Diable ALE in-line error highlighting and rely on the markers in the gutter. +highlight clear ALEError +highlight link ALEError NONE + let mapleader=" " let g:markdown_recommended_style=0 @@ -38,6 +51,10 @@ autocmd BufRead *.java set foldmethod=syntax inoremap +let g:copilot_filetypes = { + \ 'nim': v:false, + \} + " Search for selected text, forwards or backwards. vnoremap * : \let old_reg=getreg('"')let old_regtype=getregtype('"') @@ -51,12 +68,19 @@ vnoremap # : \gV:call setreg('"', old_reg, old_regtype) let g:solarized_contrast="high" +"Highlight lines past 80 characters long +"highlight OverLength ctermbg=red ctermfg=white guibg=#592929 +"match OverLength /\%80v.\+/ +"autocmd BufAdd .* match OverLength /\%80v.\+/ + let g:ale_fixers = { \ '*': ['remove_trailing_lines', 'trim_whitespace'], - \ 'javascript': ['deno', 'eslint'], - \ 'typescript': ['deno', 'eslint', 'prettier'], \ 'vue': ['prettier'], \} +" The following ALE fixer configs have been moved into local RC files (.lvimrc) +" \ 'javascript': ['deno', 'eslint'], +" \ 'typescript': ['deno', 'eslint', 'prettier'], + " Disable linters on markdown. I personally don't find any of these useful " enough to includ in my general authorship. However, ALE performs the check @@ -68,7 +92,7 @@ let g:ale_linters = { \ 'html': ['HTMLHint', 'proselint', 'write-good'], \ 'rst': [], \ 'python': ['pylint'], - \ 'typescript': ['deno', 'eslint'], + \ 'vue': ['prettier'], \} " default (as of time of writing) was: " \ 'markdown': ['alex', 'cspell', 'languagetool', 'markdownlint', 'mdl', 'proselint', 'redpen', 'remark_lint', 'textlint', 'vale', 'writegood'], @@ -93,22 +117,7 @@ let g:tsuquyomi_disable_quickfix = 1 let g:ale_set_loclist = 0 let g:ale_set_quickfix = 0 -" Generate Java Getter and Setter for one property. -" Expects property lines to match /private \w\+ \w\+/ -" Requires mark A to be set at the current property line start and mark B to -" be set where the getter and setter should be inserted. The marks are updated -" so that the command can be immediately invoked again for a subsequent -" property. -" nmap gs wve"tywve"py'bo public void set "ppbvUhxA("tpA "ppA) { this."ppA = "ppA; } public "tpA get "ppbvUhxA() { return this."ppA; }mb'a/private \w+\+ \w\+; ma -nmap jgs :let @t='':let @n='''a0v$:s/\v^\s*(private\|public\|protected)? ?(\w+(\<[^>]+\>)?) (\w+);/\=setreg('T', submatch(2))/n0v$:s/\v^\s*(private\|public\|protected)? ?(\w+(\<[^>]+\>)?) (\w+);/\=setreg('N', submatch(4))/n'bopublic "tpA get "npbvUhxA() { return this."npA;}<public void set "npbvUhxA("tpA "npA) { this."npA = "npA;}<jci :UnusedImportsRemove - -" Format the file using java-file-formatter. java-file-formatter should be a -" command that takes a file path as the first argument and either alters the -" file in place or prints out the altered file on STDOUT. -nmap jsf :!java-file-formatter %:p +let g:localvimrc_whitelist = '/home/jdb/projects/probatem/*/.*' nmap wo :vsplit /home/jdbernard/projects/worklog/worklog.txtL200<43> nmap ws :w:silent !git add %:!git commit