...
 
Commits (4)
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
remote = green remote = green
[color "diff"] [color "diff"]
meta = yellow meta = 238 italic
frag = magenta frag = 240
old = red strike old = red strike
new = green italic new = green italic
whitespace = red reverse whitespace = red reverse
......
...@@ -65,7 +65,7 @@ Channel Personal-folders ...@@ -65,7 +65,7 @@ Channel Personal-folders
Master :Personal-remote: Master :Personal-remote:
Slave :Personal-local: Slave :Personal-local:
# All folders except those defined above # All folders except those defined above
Patterns * !INBOX !Archive !Drafts !Starred !Sent !Spam !Trash ![Gmail]* Patterns * !INBOX !Personal.Archive !Personal.Drafts !Personal.Starred !Personal.Sent !Personal.Spam !Personal.Trash ![Gmail]*
# Group the channels, so that all channels can be sync'd with `mbsync personal` # Group the channels, so that all channels can be sync'd with `mbsync personal`
Group personal Group personal
...@@ -139,7 +139,7 @@ Channel Work-folders ...@@ -139,7 +139,7 @@ Channel Work-folders
Master :Work-remote: Master :Work-remote:
Slave :Work-local: Slave :Work-local:
# All folders except those defined above # All folders except those defined above
Patterns * !INBOX !Archive !Drafts !Starred !Sent !Spam !Trash ![Gmail]* Patterns * !INBOX !Work.Archive !Work.Drafts !Work.Starred !Work.Sent !Work.Spam !Work.Trash ![Gmail]*
# Group the channels, so that all channels can be sync'd with `mbsync work` # Group the channels, so that all channels can be sync'd with `mbsync work`
Group work Group work
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
WIFI_NAME=$(wifi) WIFI_NAME=$(wifi)
ON_ICON=" " ON_ICON=" "
OFF_ICON'⨉' OFF_ICON=" "
TAIL="#[fg=colour237] ⦁ " TAIL="#[fg=colour237] ⦁ "
[ -n "$WIFI_NAME" ] && printf "%s" "$ON_ICON $WIFI_NAME$TAIL" || printf "#[fg=red]%s" "$OFF_ICON$TAIL" [ "$WIFI_NAME" = "" ] && printf "#[fg=red]%s" "$OFF_ICON$TAIL" || printf "%s" "$ON_ICON $WIFI_NAME$TAIL"
...@@ -43,26 +43,29 @@ let g:ale_linters = { ...@@ -43,26 +43,29 @@ let g:ale_linters = {
\ 'javascript': ['eslint'], \ 'javascript': ['eslint'],
\ 'javascript.jsx': ['eslint'], \ 'javascript.jsx': ['eslint'],
\ 'typescript': ['eslint'], \ 'typescript': ['eslint'],
\ 'typescript.tsx': ['eslint'],
\ 'typescriptreact': ['eslint'],
\} \}
" ESLint --fix is so slow to run it as part of the fixers, so I do this using a precommit hook or something else " ESLint --fix is so slow to run it as part of the fixers, so I do this using a precommit hook or something else
let g:ale_fixers = { let g:ale_fixers = {
\ '*' : ['remove_trailing_lines', 'trim_whitespace'], \ '*' : ['remove_trailing_lines', 'trim_whitespace'],
\ 'markdown' : ['prettier'], \ 'markdown' : ['prettier'],
\ 'javascript': ['prettier'], \ 'javascript' : ['prettier'],
\ 'typescript': ['prettier'], \ 'typescript' : ['prettier'],
\ 'css' : ['prettier'], \ 'typescriptreact': ['prettier'],
\ 'json' : ['prettier'], \ 'css' : ['prettier'],
\ 'scss' : ['prettier'], \ 'json' : ['prettier'],
\ 'yaml' : ['prettier'], \ 'scss' : ['prettier'],
\ 'graphql' : ['prettier'], \ 'yaml' : ['prettier'],
\ 'html' : ['prettier'], \ 'graphql' : ['prettier'],
\ 'reason' : ['refmt'], \ 'html' : ['prettier'],
\ 'python' : ['black'], \ 'reason' : ['refmt'],
\ 'sh' : ['shfmt'], \ 'python' : ['black'],
\ 'bash' : ['shfmt'], \ 'sh' : ['shfmt'],
\ 'rust' : ['rustfmt'], \ 'bash' : ['shfmt'],
\ 'go' : ['gofmt'], \ 'rust' : ['rustfmt'],
\ 'go' : ['gofmt'],
\} \}
" Don't auto auto-format files inside `node_modules`, `forks` directory, minified files and jquery (for legacy codebases) " Don't auto auto-format files inside `node_modules`, `forks` directory, minified files and jquery (for legacy codebases)
......
...@@ -5,7 +5,7 @@ let g:vim_markdown_fenced_languages = [ ...@@ -5,7 +5,7 @@ let g:vim_markdown_fenced_languages = [
\'js=javascript', \'js=javascript',
\'jsx=javascript.jsx', \'jsx=javascript.jsx',
\'ts=typescript', \'ts=typescript',
\'tsx=typescript.tsx', \'tsx=typescriptreact',
\'json', \'json',
\'json5', \'json5',
\'ruby', \'ruby',
......
...@@ -54,14 +54,6 @@ function! plugins#install_plugins() abort ...@@ -54,14 +54,6 @@ function! plugins#install_plugins() abort
call minpac#add('https://github.com/wincent/terminus') call minpac#add('https://github.com/wincent/terminus')
call minpac#add('https://github.com/tommcdo/vim-lion') call minpac#add('https://github.com/tommcdo/vim-lion')
call minpac#add('https://github.com/liuchengxu/vista.vim') call minpac#add('https://github.com/liuchengxu/vista.vim')
let g:vista#renderer#enable_icon = 1
let g:vista_executive_for = {
\ 'javascript': 'coc',
\ 'javascript.jsx': 'coc',
\ 'typescript': 'coc',
\ 'typescript.tsx': 'coc',
\ }
let g:vista_close_on_jump = 1
call minpac#add('https://github.com/christoomey/vim-tmux-navigator', {'type': 'opt'}) call minpac#add('https://github.com/christoomey/vim-tmux-navigator', {'type': 'opt'})
call minpac#add('https://github.com/tpope/vim-dispatch') call minpac#add('https://github.com/tpope/vim-dispatch')
let g:dispatch_no_tmux_make = 1 " Prefer job strategy even in tmux. let g:dispatch_no_tmux_make = 1 " Prefer job strategy even in tmux.
......
...@@ -3,10 +3,12 @@ if !exists(':Vista') ...@@ -3,10 +3,12 @@ if !exists(':Vista')
endif endif
let g:vista#renderer#enable_icon = 1 let g:vista#renderer#enable_icon = 1
let g:vista_close_on_jump = 1
let g:vista_executive_for = { let g:vista_executive_for = {
\ 'go': 'ctags', \ 'go' : 'ctags',
\ 'javascript': 'coc', \ 'javascript' : 'coc',
\ 'typescript': 'coc', \ 'typescript' : 'coc',
\ 'javascript.jsx': 'coc', \ 'typescriptreact': 'coc',
\ 'python': 'coc', \ 'javascript.jsx' : 'coc',
\ 'python' : 'coc',
\ } \ }
typescript.snippets
\ No newline at end of file