diff --git a/.config/alacritty.yml b/.config/alacritty.yml
index 77fb4fd..cf8d640 100644
--- a/.config/alacritty.yml
+++ b/.config/alacritty.yml
@@ -15,15 +15,15 @@ scrolling:
# Font configuration
font:
normal:
- family: PragmataPro Mono Liga
+ family: PragmataPro Mono
style: Regular
italic:
- family: PragmataPro Mono Liga
+ family: PragmataPro Mono
style: Italic
bold:
- family: PragmataPro Mono Liga
+ family: PragmataPro Mono
style: Bold
# Point size
diff --git a/.config/bat/config b/.config/bat/config
index 2c1b80e..d9aa22c 100644
--- a/.config/bat/config
+++ b/.config/bat/config
@@ -2,4 +2,4 @@
--italic-text=always
--style="numbers,changes,header"
--color=always
---terminal-width=-10
+--terminal-width=120
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 601d197..890ad80 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -2,14 +2,8 @@
bspmonis &
-bspc rule -r "*"
-
bspc config border_width 2
bspc config window_gap 6
-bspc config top_padding 3
-bspc config left_padding 0
-bspc config right_padding 0
-bspc config bottom_padding 23
bspc config split_ratio 0.5
# Opciones
@@ -17,8 +11,6 @@ bspc config gapless_monocle true
bspc config ignore_ewmh_focus true
bspc config pointer_follows_focus true
bspc config removal_adjustment true
-bspc config remove_unplugged_monitors false
-bspc config remove_disabled_monitors false
bspc config honor_size_hints false
bspc config directional_focus_tightness low
bspc config automatic_scheme longest_side
@@ -45,7 +37,7 @@ bspc rule -a QjackCtl state=floating
bspc rule -a mpv state=floating
bspc rule -a Alacritty:flota state=floating
bspc rule -a Sxiv:flota state=floating
-bspc rule -a Firefox state=floating
+bspc rule -a Firefox:Browser state=floating
bspc rule -a Zathura state=tiled
bspc rule -a gzdoom state=fullscreen
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 3f6d926..eeeb914 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -92,13 +92,4 @@
foreground = "#e0d0c3"
frame_color = "#e53935"
timeout = 60
-
-[mail]
- appname = neomutt
- new_icon = "/home/deadguy/img/.icn/correo.png"
-
-[rss]
- appname = newsboat
- new_icon = "/home/deadguy/img/.icn/rss.png"
-
# vim: ft=cfg
diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
index f9419f0..a39702d 100644
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -25,7 +25,7 @@
monospace
- NotoSansMono Nerd Font
+ PragmataPro Mono
Noto Color Emoji
diff --git a/.config/git/config b/.config/git/config
index 321dae1..faac749 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,5 +1,6 @@
[alias]
st = status
+ co = checkout
fx = commit --fixup=HEAD
ci = commit -v
cm = commit -m
@@ -9,8 +10,9 @@
amend = commit --amend -v
full = show --format=fuller
noed = commit --amend --no-edit
- tr = log --graph --date-order --date=short --pretty=format:'%C(cyan)%h %C(blue)%ar%C(auto)%d%C(yellow)%s%+b %C(black)%ae'
+ tr = log --graph --date-order --date=short --pretty=format:'%C(cyan)%h %C(blue)%ar%C(auto)%d %C(yellow)%s%+b %C(black)%ae'
fz = !sha=$( git -c color.ui=always log --oneline -n 1000 | fzf +s --no-multi --prompt 'Fixup> ' ) && git commit --fixup "${sha%% *}"
+ fr = !sha=$( git -c color.ui=always log --oneline -n 1000 | fzf +s --no-multi --prompt 'Revert> ' ) && git revert "${sha%% *}"
wd = "!f() { git --paginate diff --dirstat=cumulative,files,0 ${1:-HEAD} | awk '{print $2}' | cut -d / -f1-${2:-4} | sort | uniq; }; f"
[http]
@@ -21,29 +23,60 @@
autocrlf = input
whitespace = warn
excludesfile = /home/deadguy/.config/git/gitignore
- pager = delta
+ pager = "{ \
+ COLUMNS=$(tput cols); \
+ if [ $COLUMNS -ge 80 ] && [ -z $FZF_PREVIEW_COLUMNS ]; then \
+ delta --side-by-side -w $COLUMNS; \
+ elif [ $COLUMNS -ge 160 ] && [ ! -z $FZF_PREVIEW_COLUMNS ]; then \
+ delta --side-by-side -w $FZF_PREVIEW_COLUMNS; \
+ else \
+ delta; \
+ fi \
+ }"
[interactive]
diffFilter = delta --color-only
[delta]
- features = side-by-side line-numbers decorations
- syntax-theme = zenburn
- plus-style = syntax "#003800"
- minus-style = syntax "#3f0001"
- whitespace-error-style = 22 reverse
+ side-by-side = false
+ line-numbers = true
+ syntax-theme = gruvbox
+ hunk-header-style = omit
+ file-style = blue
+ file-decoration-style = blue ul ol
+ zero-style = dim syntax
+ minus-non-emph-style = dim red
+ minus-emph-style = bold red 52
+ minus-empty-line-marker-style = normal "#3f0001"
+ plus-non-emph-style = dim green
+ plus-emph-style = bold green 22
+ plus-empty-line-marker-style = normal "#002800"
+ whitespace-error-style = reverse white
+ file-added-label = [+]
+ file-copied-label = [C]
+ file-modified-label = [M]
+ file-removed-label = [-]
+ file-renamed-label = [R]
+ line-numbers-left-format = "{nm:>1} "
+ line-numbers-right-format = "{np:>1} "
+ line-numbers-minus-style = red italic
+ line-numbers-plus-style = green italic
-[delta "decorations"]
- commit-decoration-style = yellow ul ol
- file-style = yellow ul
- file-decoration-style = none
- hunk-header-decoration-style = cyan box
-
-[delta "line-numbers"]
- line-numbers-left-style = cyan
- line-numbers-right-style = cyan
- line-numbers-minus-style = 124
- line-numbers-plus-style = 28
+[delta "flashy"]
+side-by-side = true
+line-numbers = true
+decorations = true
+syntax-theme = dracula
+plus-style = syntax "#003800"
+minus-style = syntax "#3f0001"
+commit-decoration-style = bold yellow box ul
+file-style = bold yellow ul
+file-decoration-style = none
+hunk-header-decoration-style = cyan box ul
+line-numbers-left-style = cyan
+line-numbers-right-style = cyan
+line-numbers-minus-style = 124
+line-numbers-plus-style = 28
[web]
browser = firefox
diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc
index b42e312..cbaf59d 100644
--- a/.config/neomutt/neomuttrc
+++ b/.config/neomutt/neomuttrc
@@ -3,29 +3,32 @@ source neomuttrc.d/gpg.rc
source neomuttrc.d/bindings.neomuttrc
source neomuttrc.d/colors.neomuttrc
source neomuttrc.d/powerline.neomuttrc
+source neomuttrc.d/news.neomuttrc
unset help
-set mailcap_path = ~/.config/neomutt/mailcap
+unset signature
set mime_type_query_command = "file --mime-type -b %s"
+set mailcap_path = ~/.config/neomutt/mailcap
set sort = threads
set sort_aux = reverse-last-date-received
set strict_threads
set smtp_authenticators = 'gssapi:login'
set attribution = "En %{!%F a las %R}, %n escribió:"
set date_format = "%F %R"
-set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
-set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
+set quote_regex = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
+set reply_regex = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
set send_charset = "utf-8"
set forward_format = "Fwd: %s" # Format of subject when forwarding
+set timeout = 2
set sleep_time = 0 # Pause 0 seconds for informational messages
set mail_check = 60 # To avoid lags using IMAP
-set wrap = 100
+set use_envelope_from = yes
+set edit_headers = yes
set rfc2047_parameters = yes
-set smart_wrap = yes
-set reverse_realname = yes # Use any real name provided when replying
set mime_forward = yes # Attachments are forwarded with mail
set auto_tag = yes # Automatically apply actions to all tagged messages
set delete = yes # Don't ask, do.
+set edit_headers = yes # Allow editing fields
set sidebar_visible = no # Not needed
set markers = no # Disables the `+` displayed at line wraps
set mark_old = no # Unread mail stay unread until read
@@ -35,14 +38,11 @@ set fast_reply # skip to compose when replying
set fcc_attach # save attachments with the body
set forward_quote # include message in forwards
set reverse_name # reply as whomever it was to
-set include # include message in replies
set menu_scroll # scroll in menus
-set autoedit
-set edit_headers
-set sort_re
set arrow_cursor
+set pipe_decode
-set pager_index_lines = 13
+set pager_index_lines = 10
set pager_context = 3
set pager_stop
@@ -55,6 +55,9 @@ auto_view text/x-patch
auto_view application/ics
auto_view application/pgp-encrypted
+set print_command = "nvim -R -c 'set ft=mail background=dark \
+ popt=header:0' -c 'ha' -c 'q' -"
+
# neomutt doesn't have this yet :(
# set editor = "carta.sh `echo $EDITOR`"
# set background_edit = `[ -n "$TMUX" ] && echo 'yes' || echo 'no'`
@@ -62,8 +65,8 @@ auto_view application/pgp-encrypted
# Header Options
ignore *
unhdr_order *
-unignore from subject to cc date x-mailer x-url user-agent
-hdr_order date from to cc subject
+unignore from subject to cc bcc date x-mailer x-url user-agent
+hdr_order date from to cc bcc subject
# Warns if replying to multiple recipt email
reply-hook "~C 2" "set sleep_time=10\;echo 'Warning, original message has multiple recipients!'\;set sleep_time=1"
diff --git a/.config/neomutt/neomuttrc.d/bindings.neomuttrc b/.config/neomutt/neomuttrc.d/bindings.neomuttrc
index 224f6b7..4bd8f0f 100644
--- a/.config/neomutt/neomuttrc.d/bindings.neomuttrc
+++ b/.config/neomutt/neomuttrc.d/bindings.neomuttrc
@@ -43,6 +43,20 @@ bind pager,attach h exit
bind index,pager,browser d half-down
bind index,pager,browser u half-up
+# View an attachment in the GUI browser
+macro attach \cv "\
+ set my_pipe_decode=\$pipe_decode pipe_decode\
+ attachview\
+ set pipe_decode=\$my_pipe_decode; unset my_pipe_decode" \
+"Open attachment in GUI browser"
+
+# twtxt
+macro index,pager,attach,compose T "\
+ set my_pipe_decode=\$pipe_decode nopipe_decode\
+ twt-reply\
+ set pipe_decode=\$my_pipe_decode; unset my_pipe_decode" \
+"Reply to current twt"
+
macro index \Cr "T~UN." "mark all messages as read"
macro index O "mbsync -c ~/.config/isync/mbsyncrc -a" "run mbsync to sync all mail"
macro index \Cf "unset wait_keyread -p 'Enter a search term to find with notmuch: ' x; echo \$x >~/.cache/mutt_terms~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"" "show only messages matching a notmuch pattern"
@@ -51,8 +65,7 @@ macro index A "all\n" "show all messages (undo limit)"
macro browser h '..' "Go to parent folder"
macro index,pager 'source /home/deadguy/.config/neomutt/accounts/6-dgy@fuckup.club.muttrc!;' "switch to dgy@fuckup.club" # mw-autogenerated
-macro index,pager 'source ~/.config/neomutt/accounts/1-alex.muttrc!;' "switch to vidaar@gmail.com"
-macro index,pager 'source ~/.config/neomutt/accounts/2-alejo.muttrc!;' "switch to alejo.jardon@gmail.com"
-macro index,pager 'source ~/.config/neomutt/accounts/4-iamz@airmail.cc.muttrc!;' "switch to iamz@airmail.cc"
-macro index,pager 'source ~/.config/neomutt/accounts/3-git.muttrc!;' "switch to adeadgit@gmail.com"
-macro index,pager a "set my_pipe_decode=\$pipe_decode pipe_decodeabook --add-emailset pipe_decode=\$my_pipe_decode; unset my_pipe_decode" "add the sender address to abook"
+macro index,pager 'source ~/.config/neomutt/accounts/3-dgy@texto-plano.xyz.muttrc!;' "switch to adeadgit@gmail.com"
+macro index,pager 'source ~/.config/neomutt/accounts/1-vidaar@gmail.com.muttrc!;' "switch to vidaar@gmail.com"
+macro index,pager 'source ~/.config/neomutt/accounts/2-alejo.muttrc!;' "switch to alejo.jardon@gmail.com"
+macro index,pager 'source ~/.config/neomutt/accounts/4-iamz@airmail.cc.muttrc!;' "switch to iamz@airmail.cc"
diff --git a/.config/neomutt/neomuttrc.d/powerline.neomuttrc b/.config/neomutt/neomuttrc.d/powerline.neomuttrc
index 5f6c9f8..a6d9737 100644
--- a/.config/neomutt/neomuttrc.d/powerline.neomuttrc
+++ b/.config/neomutt/neomuttrc.d/powerline.neomuttrc
@@ -2,28 +2,27 @@
# Powerline / nerdfont
# This is a bit "hackish" due to neomutt limitations
-#
# Author: Sheoak https://github.com/sheoak/neomutt-powerline-nerdfonts
+# Modified by Deadguy
-set index_format=" %zs %zc %zt %<[y?%<[m?%<[d?%[%R ]&%[%a %d]>&%[%b %d]>&%[%F ]> %-28.28L %?M?(%1M)& ? %?X?& ? %s"
+set index_format=" %zs %zc %zt %<[y?%<[m?%<[d?%[%R ]&%[%a %d]>&%[%b %d]>&%[%F ]> %-28.28L %?K?%15.14K& ? %?M?(%1M)& ? %?X? & ? %s %> %?g?%g?"
-set pager_format="\n %n %T %s%* %{!%F · %R} %?X? %X?%P \n \n"
-set status_format = " %f %?r? %m ?%?n? %n ?%?d? %d ?%?t? %t ?%?F? %F ?%?p? %p? \n \n"
-set vfolder_format = " %N %?n?%3n& ? %8m · %f"
-set attach_format = "%u%D %T%-75.75d %?T?%& ? %5s · %m/%M"
+set pager_format="\n%n %T %s%* %{!%F · %R} %?X? %X? %P\n \n"
+set status_format = " %f %?r? %m ?%?n? %n ?%?d? %d ?%?t? %t ?%?F? %F ?%?p? %p? %> %P\n \n"
+set vfolder_format = " %N %?n?%3n& ? %8m · %f"
+set attach_format = "%u%D %T%-75.75d %?T?%& ? %5s · %m/%M"
-# no addressed to me, to me, group, cc, sent by me, mailing list
-set to_chars=""
+# not addressed to me, to me, not only recipient, cc, sent by me, mailing list, reply-to
+set to_chars=" "
# unchanged mailbox, changed, read only, attach mode
set status_chars = " "
-ifdef crypt_chars set crypt_chars = " "
-set flag_chars = " "
+ifdef crypt_chars set crypt_chars = " "
+set flag_chars = " "
-set hidden_tags = "unread,draft,flagged,passed,replied,attachment,signed,encrypted"
-tag-transforms "replied" "↻ " \
- "encrytpted" "" \
- "signed" "" \
- "attachment" "" \
+tag-transforms "replied" " " \
+ "encrytpted" " " \
+ "signed" " " \
+ "attachment" " " \
# The formats must start with 'G' and the entire sequence is case sensitive.
tag-formats "replied" "GR" \
@@ -38,8 +37,8 @@ color status color12 default '(\s)([a-zA-Z0-9])'
color status color12 default '( )'
color status color12 default '(\S)'
color status color0 default '(|)'
-color status green default ''
-color status white default ''
-color status yellow default ''
-color status red default ''
+color status green default ' '
+color status white default ' '
+color status yellow default ' '
+color status red default ' '
color tree color15 default
diff --git a/.config/newsboat/config b/.config/newsboat/config
index 02421f2..cf9508d 100644
--- a/.config/newsboat/config
+++ b/.config/newsboat/config
@@ -78,6 +78,6 @@ save-path ~/.config/newsboat/saved
macro , open-in-browser
macro d set browser "ytdl"; open-in-browser ; set browser linkhandler
macro v set browser "setsid nohup mpv"; open-in-browser ; set browser linkhandler
-macro w set browser "tmux split-window -hp 60 && tmux send-keys '$lynx %u && tmux kill-pane\n'"; open-in-browser ; set browser linkhandler
+macro w set browser "tmux split-window -hp 60 && tmux send-keys 'lynx %u && tmux kill-pane\n'"; open-in-browser ; set browser linkhandler
# vim: ft=conf cms=#%s
diff --git a/.config/nvim/after/ftplugin/go.vim b/.config/nvim/after/ftplugin/go.vim
index f421b96..c15c856 100644
--- a/.config/nvim/after/ftplugin/go.vim
+++ b/.config/nvim/after/ftplugin/go.vim
@@ -3,14 +3,18 @@ setlocal shiftwidth=4
setlocal tabstop=4
setlocal foldmethod=syntax
+let g:go_textobj_include_function_doc = 1
let g:go_autodetect_gopath = 1
let g:go_imports_autosave = 1
let g:go_doc_popup_window = 1
let g:go_gopls_enabled = 1
+let g:go_metalinter_autosave = 1
let g:go_fmt_command = "goimports"
let g:go_list_type = "quickfix"
" Go syntax highlighting
+let g:go_highlight_types = 1
+let g:go_highlight_build_constraints = 1
let g:go_highlight_fields = 1
let g:go_highlight_functions = 1
let g:go_highlight_function_calls = 1
@@ -23,14 +27,12 @@ let g:go_auto_type_info = 1
" Add the failing test name to the output of :GoTest
let g:go_test_show_name = 1
-let b:ale_linters = ['gopls']
-
inoremap . .
-nmap t :GoTest!
-nmap v :GoVet!
-nmap b :GoBuild!
-nmap i :GoInstall!
-nmap l :GoMetaLinter!
-nmap r :GoRun %
-nmap d :GoDebugStart!
+nmap t :GoTest!
+nmap b :GoBuild!
+nmap i :GoInstall!
+nmap R :GoRun %
+nmap x :GoDebugStart!
nmap r :GoRun!
+nmap d :GoDoc
+nmap D :GoDocBrowser
diff --git a/.config/nvim/after/ftplugin/javascript.vim b/.config/nvim/after/ftplugin/javascript.vim
index f7e3848..6ad607e 100644
--- a/.config/nvim/after/ftplugin/javascript.vim
+++ b/.config/nvim/after/ftplugin/javascript.vim
@@ -1,5 +1,3 @@
-let b:ale_linters = ['prettier_standard']
-let b:ale_fixers = ['prettier_standard']
setlocal path=.,**
setlocal path-=/usr/include
setlocal suffixesadd+=.js
diff --git a/.config/nvim/after/ftplugin/json.vim b/.config/nvim/after/ftplugin/json.vim
deleted file mode 100644
index 6498b1a..0000000
--- a/.config/nvim/after/ftplugin/json.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-let b:ale_linters = ['prettier']
-let b:ale_fixers = ['prettier']
diff --git a/.config/nvim/after/ftplugin/jsx.vim b/.config/nvim/after/ftplugin/jsx.vim
deleted file mode 100644
index 77325c5..0000000
--- a/.config/nvim/after/ftplugin/jsx.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-let b:ale_linters = ['prettier_standard']
-let b:ale_fixers = ['prettier_standard']
diff --git a/.config/nvim/after/ftplugin/markdown.vim b/.config/nvim/after/ftplugin/markdown.vim
index 37f6070..d879808 100644
--- a/.config/nvim/after/ftplugin/markdown.vim
+++ b/.config/nvim/after/ftplugin/markdown.vim
@@ -2,10 +2,25 @@ setlocal nonumber norelativenumber laststatus=0 showmode
setlocal signcolumn=no textwidth=80 wrap sw=2
setlocal tabstop=2 noexpandtab softtabstop=0 linebreak
setlocal autoindent ruler colorcolumn=80
+setlocal complete+=kspell
setlocal spell spelllang=es,en_us,cjk
-setlocal formatoptions&
-setlocal formatoptions+=tqnw
-setlocal formatlistpat=^\\s*\\(\\d\\+\\\|[a-z]\\)[\\].)]\\s*
+setlocal formatoptions=1tqnw
+setlocal comments=n:>
+setlocal formatlistpat=^\\s* " Optional leading whitespace
+setlocal formatlistpat+=[ " Start character class
+setlocal formatlistpat+=\\[({]\\? " | Optionally match opening punctuation
+setlocal formatlistpat+=\\( " | Start group
+setlocal formatlistpat+=[0-9]\\+ " | | Numbers
+setlocal formatlistpat+=\\\| " | | or
+setlocal formatlistpat+=[a-zA-Z]\\+ " | | Letters
+setlocal formatlistpat+=\\) " | End group
+setlocal formatlistpat+=[\\]:.)} " | Closing punctuation
+setlocal formatlistpat+=] " End character class
+setlocal formatlistpat+=\\s\\+ " One or more spaces
+setlocal formatlistpat+=\\\| " or
+setlocal formatlistpat+=^\\s*[-+*]\\s\\+ " Bullet points
+setlocal comments=b:*,b:-
+setlocal commentstring=
" Spellcheck
nnoremap [s
@@ -24,6 +39,3 @@ inoremap :.s/\[\]/\[x\]
" Markdown jump to next heading
nnoremap ]] :call dead#functions#JumpToNextHeading("down", v:count1)
nnoremap [[ :call dead#functions#JumpToNextHeading("up", v:count1)
-
-let b:ale_linters = ['prettier']
-let b:ale_fixers = ['prettier']
diff --git a/.config/nvim/after/ftplugin/qf.vim b/.config/nvim/after/ftplugin/qf.vim
index f652c82..e482937 100644
--- a/.config/nvim/after/ftplugin/qf.vim
+++ b/.config/nvim/after/ftplugin/qf.vim
@@ -3,8 +3,9 @@ setlocal nospell
setlocal nolist
" Close with q
-nnoremap q :close
+nnoremap q :close
+nnoremap dd :call qf#delitem()
nnoremap :call older()
nnoremap :call newer()
diff --git a/.config/nvim/after/ftplugin/scss.vim b/.config/nvim/after/ftplugin/scss.vim
deleted file mode 100644
index cb50a73..0000000
--- a/.config/nvim/after/ftplugin/scss.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-let b:ale_linters = ['stylelint']
-let b:ale_fixers = ['stylelint']
diff --git a/.config/nvim/after/ftplugin/sh.vim b/.config/nvim/after/ftplugin/sh.vim
index a5cd012..3e5bdd6 100644
--- a/.config/nvim/after/ftplugin/sh.vim
+++ b/.config/nvim/after/ftplugin/sh.vim
@@ -4,5 +4,12 @@ endif
let b:sh_indent_options['continuation-line'] = 2
-let b:ale_linters = ['shellcheck']
-let b:ale_fixers = ['shfmt']
+" command! -buffer -bang Lint compiler shfmt | lmake
+" command! -buffer -bang Compile compiler shellcheck | make
+
+" augroup linty
+" au! *
+" au BufWritePre Lint
+" au BufWritePost :silent Compile
+" au QuickFixCmdPost make cwindow
+" augroup END
diff --git a/.config/nvim/after/ftplugin/typescript.vim b/.config/nvim/after/ftplugin/typescript.vim
deleted file mode 100644
index dddc495..0000000
--- a/.config/nvim/after/ftplugin/typescript.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-let b:ale_linters = ['tsserver', 'eslint']
-let b:ale_linters = ['prettier_standard']
diff --git a/.config/nvim/after/ftplugin/vim.vim b/.config/nvim/after/ftplugin/vim.vim
deleted file mode 100644
index b2be616..0000000
--- a/.config/nvim/after/ftplugin/vim.vim
+++ /dev/null
@@ -1 +0,0 @@
-" let b:ale_linters = ['vint']
diff --git a/.config/nvim/after/ftplugin/yaml.vim b/.config/nvim/after/ftplugin/yaml.vim
deleted file mode 100644
index 1b82e71..0000000
--- a/.config/nvim/after/ftplugin/yaml.vim
+++ /dev/null
@@ -1 +0,0 @@
-let b:ale_linters = ['prettier']
diff --git a/.config/nvim/after/ftplugin/zsh.vim b/.config/nvim/after/ftplugin/zsh.vim
index 6f78fab..9cdbe22 100644
--- a/.config/nvim/after/ftplugin/zsh.vim
+++ b/.config/nvim/after/ftplugin/zsh.vim
@@ -1 +1,9 @@
setlocal shiftwidth=2
+
+command! -buffer -bang Compile compiler zsh | make
+
+augroup linty
+ au! *
+ au BufWritePost Compile
+ au QuickFixCmdPost make cwindow
+augroup END
diff --git a/.config/nvim/after/plugin/coc.vim b/.config/nvim/after/plugin/coc.vim
index 09c8474..e8898ed 100644
--- a/.config/nvim/after/plugin/coc.vim
+++ b/.config/nvim/after/plugin/coc.vim
@@ -1,30 +1,26 @@
-if exists('b:coc_enabled=1')
+" if exists('b:coc_enabled=1')
set completeopt-=preview
- nnoremap :vsplit:CocConfig
+ nnoremap :vsplit:CocConfig
- let g:coc_global_extensions = ['coc-highlight', 'coc-snippets', 'coc-tsserver', 'coc-css', 'coc-html', 'coc-json', 'coc-emmet']
-
- inoremap
- \ pumvisible() ? "\" :
- \ coc#expandableOrJumpable() ?
- \ "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" :
- \ check_back_space() ? "\" :
- \ coc#refresh()
-
- function! s:check_back_space() abort
- let col = col('.') - 1
- return !col || getline('.')[col - 1] =~# '\s'
- endfunction
-
- inoremap coc#refresh()
+ let g:coc_global_extensions = ['coc-diagnostic', 'coc-prettier', 'coc-highlight', 'coc-snippets', 'coc-tsserver', 'coc-css', 'coc-html', 'coc-json', 'coc-emmet']
+ " Use to confirm completion, `u` means break undo chain at current
+ " position. Coc only does snippet and additional edit on confirm.
if exists('*complete_info')
- inoremap complete_info()["selected"] != "-1" ? "\" : "\u\"
+ inoremap complete_info()["selected"] != "-1" ? "\" : "\u\"
else
- inoremap pumvisible() ? "\" : "\u\"
+ imap pumvisible() ? "\" : "\u\"
endif
+ " use for trigger completion
+ inoremap coc#refresh()
+
+ " Navigate diagnostics
+ nnoremap :CocList diagnostics
+ nmap (coc-diagnostic-prev)
+ nmap