...
 
Commits (5)
......@@ -7,10 +7,10 @@ tap "homebrew/cask-versions"
tap "homebrew/bundle"
tap "homebrew/services"
tap "neomutt/homebrew-neomutt"
tap "tavianator/tap"
tap "universal-ctags/universal-ctags"
tap "sachaos/todoist"
tap "dbcli/tap"
tap "dandavison/delta", "https://github.com/dandavison/delta"
# Core
brew "openssl"
......@@ -48,6 +48,7 @@ brew "rename"
brew "z"
brew "tig"
brew "diff-so-fancy"
brew "dandavison/delta/git-delta"
brew "fd"
brew "jq"
brew "yq"
......
......@@ -21,7 +21,7 @@
attributesfile = ~/.git.d/.gitattributes
; https://news.ycombinator.com/item?id=11388479
untrackedCache = true
pager = diff-so-fancy | less --tabs=4 -RFX
pager = delta --dark --hunk-style plain --theme OneHalfDark
; # conflicts with Markdown
commentChar = %
hooksPath = ~/.git.d/hooks
......@@ -109,8 +109,8 @@
remote = green
[color "diff"]
meta = yellow
frag = magenta
meta = 238 italic
frag = 240
old = red strike
new = green italic
whitespace = red reverse
......@@ -127,14 +127,6 @@
newNormal = green italic
newHighlight = green italic 22
[pager]
show = diff-so-fancy | less --tabs=4 -RFX --pattern '^(Date|added|deleted|modified): '
diff = diff-so-fancy | less --tabs=4 -RFX --pattern '^(Date|added|deleted|modified): '
; https://github.com/so-fancy/diff-so-fancy/issues/296
; [interactive]
; diffFilter = diff-so-fancy --patch-mode | less --tabs=4 -RFX
[alias]
amend = commit --amend --no-edit
force = push --force-with-lease
......@@ -228,6 +220,3 @@
[protocol "keybase"]
allow = always
[diff-so-fancy]
first-run = false
......@@ -65,7 +65,7 @@ Channel Personal-folders
Master :Personal-remote:
Slave :Personal-local:
# 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 personal
......@@ -139,7 +139,7 @@ Channel Work-folders
Master :Work-remote:
Slave :Work-local:
# 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 work
......
......@@ -3,7 +3,7 @@
WIFI_NAME=$(wifi)
ON_ICON=" "
OFF_ICON'⨉'
OFF_ICON=" "
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 = {
\ 'javascript': ['eslint'],
\ 'javascript.jsx': ['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
let g:ale_fixers = {
\ '*' : ['remove_trailing_lines', 'trim_whitespace'],
\ 'markdown' : ['prettier'],
\ 'javascript': ['prettier'],
\ 'typescript': ['prettier'],
\ 'css' : ['prettier'],
\ 'json' : ['prettier'],
\ 'scss' : ['prettier'],
\ 'yaml' : ['prettier'],
\ 'graphql' : ['prettier'],
\ 'html' : ['prettier'],
\ 'reason' : ['refmt'],
\ 'python' : ['black'],
\ 'sh' : ['shfmt'],
\ 'bash' : ['shfmt'],
\ 'rust' : ['rustfmt'],
\ 'go' : ['gofmt'],
\ '*' : ['remove_trailing_lines', 'trim_whitespace'],
\ 'markdown' : ['prettier'],
\ 'javascript' : ['prettier'],
\ 'typescript' : ['prettier'],
\ 'typescriptreact': ['prettier'],
\ 'css' : ['prettier'],
\ 'json' : ['prettier'],
\ 'scss' : ['prettier'],
\ 'yaml' : ['prettier'],
\ 'graphql' : ['prettier'],
\ 'html' : ['prettier'],
\ 'reason' : ['refmt'],
\ 'python' : ['black'],
\ 'sh' : ['shfmt'],
\ 'bash' : ['shfmt'],
\ 'rust' : ['rustfmt'],
\ 'go' : ['gofmt'],
\}
" 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 = [
\'js=javascript',
\'jsx=javascript.jsx',
\'ts=typescript',
\'tsx=typescript.tsx',
\'tsx=typescriptreact',
\'json',
\'json5',
\'ruby',
......
......@@ -54,14 +54,6 @@ function! plugins#install_plugins() abort
call minpac#add('https://github.com/wincent/terminus')
call minpac#add('https://github.com/tommcdo/vim-lion')
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/tpope/vim-dispatch')
let g:dispatch_no_tmux_make = 1 " Prefer job strategy even in tmux.
......
......@@ -3,10 +3,12 @@ if !exists(':Vista')
endif
let g:vista#renderer#enable_icon = 1
let g:vista_close_on_jump = 1
let g:vista_executive_for = {
\ 'go': 'ctags',
\ 'javascript': 'coc',
\ 'typescript': 'coc',
\ 'javascript.jsx': 'coc',
\ 'python': 'coc',
\ 'go' : 'ctags',
\ 'javascript' : 'coc',
\ 'typescript' : 'coc',
\ 'typescriptreact': 'coc',
\ 'javascript.jsx' : 'coc',
\ 'python' : 'coc',
\ }
typescript.snippets
\ No newline at end of file