diff options
author | Tucker Evans <tuckerevans24@gmail.com> | 2018-09-02 14:32:00 -0400 |
---|---|---|
committer | Tucker Evans <tuckerevans24@gmail.com> | 2018-09-02 14:32:00 -0400 |
commit | d071b1b3c57261b3828b4dd654fb22a48b24808e (patch) | |
tree | 5ba7ebce88b6aac182c27a62afcab6c07b8bac71 | |
parent | b5e08c7f88afef0747e1e88dfc91e18ab3a32390 (diff) | |
parent | 9fe0ad06d4ce048fc24c4c1b102f26154457984a (diff) |
Merge branch 'ursa_minor'
-rw-r--r-- | .gitmodules | 6 | ||||
-rw-r--r-- | X/.xinitrc | 1 | ||||
-rw-r--r-- | bash/.bashrc | 4 | ||||
-rw-r--r-- | i3/.config/i3status/config | 6 | ||||
-rw-r--r-- | mbsync/.mbsyncrc | 108 | ||||
-rw-r--r-- | msmtp/.msmtprc | 26 | ||||
-rw-r--r-- | mutt/.mutt/clarkson.edu | 11 | ||||
-rw-r--r-- | mutt/.muttrc | 6 | ||||
-rw-r--r-- | newsboat/.newsboat/config | 11 | ||||
-rw-r--r-- | newsboat/.newsboat/urls | 14 | ||||
-rw-r--r-- | tmux/.tmux.conf | 2 | ||||
-rw-r--r-- | vim/.vim/colors/moonfly.vim | 511 | ||||
-rw-r--r-- | vim/.vim/ftplugin/asm.vim (renamed from vim/.vim/after/ftplugin/asm.vim) | 0 | ||||
-rw-r--r-- | vim/.vim/ftplugin/by.vim (renamed from vim/.vim/after/ftplugin/by.vim) | 0 | ||||
-rw-r--r-- | vim/.vim/ftplugin/c.vim (renamed from vim/.vim/after/ftplugin/c.vim) | 1 | ||||
-rw-r--r-- | vim/.vim/ftplugin/conf.vim | 2 | ||||
-rw-r--r-- | vim/.vim/ftplugin/go.vim (renamed from vim/.vim/after/ftplugin/go.vim) | 0 | ||||
-rw-r--r-- | vim/.vim/ftplugin/java.vim (renamed from vim/.vim/after/ftplugin/java.vim) | 0 | ||||
-rw-r--r-- | vim/.vim/ftplugin/mail.vim | 3 | ||||
-rw-r--r-- | vim/.vim/ftplugin/python.vim | 7 | ||||
-rw-r--r-- | vim/.vim/ftplugin/tex.vim (renamed from vim/.vim/after/ftplugin/tex.vim) | 0 | ||||
-rw-r--r-- | vim/.vim/ftplugin/tr.vim (renamed from vim/.vim/after/ftplugin/tr.vim) | 0 | ||||
-rw-r--r-- | vim/.vim/ftplugin/tree.vim | 13 | ||||
-rw-r--r-- | vim/.vim/ftplugin/txt.vim (renamed from vim/.vim/after/ftplugin/txt.vim) | 0 | ||||
m--------- | vim/.vim/pack/tje/opt/nerdtree | 0 | ||||
m--------- | vim/.vim/pack/tje/start/vim-gitgutter | 0 | ||||
m--------- | vim/.vim/pack/tje/start/vim-go | 0 | ||||
m--------- | vim/.vim/pack/tje/start/vim-ledger | 0 | ||||
-rw-r--r-- | vim/.vimrc | 12 |
29 files changed, 691 insertions, 53 deletions
diff --git a/.gitmodules b/.gitmodules index 068b2dc..7e0fd55 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,9 @@ [submodule "bash/.git-prompt"] path = bash/.git-prompt url = https://github.com/magicmonty/bash-git-prompt.git +[submodule "vim/.vim/pack/tje/start/vim-go"] + path = vim/.vim/pack/tje/start/vim-go + url = https://github.com/fatih/vim-go +[submodule "vim/.vim/pack/tje/start/vim-ledger"] + path = vim/.vim/pack/tje/start/vim-ledger + url = https://github.com/ledger/vim-ledger.git @@ -4,3 +4,4 @@ #xrdb -merge /home/tje/.Xresources #start-pulseaudio-x11 & exec i3 +exec twm diff --git a/bash/.bashrc b/bash/.bashrc index 8822776..391bc5e 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,7 +1,9 @@ # .bashrc set -o vi -#source ~/.pass_completion +source ~/.pass_completion +HISTSIZE=1000 +HISTFILESIZE=8000 # If not running interactively, don't do anything [[ $- != *i* ]] && return diff --git a/i3/.config/i3status/config b/i3/.config/i3status/config index b4f4c36..f7ddbcc 100644 --- a/i3/.config/i3status/config +++ b/i3/.config/i3status/config @@ -29,7 +29,7 @@ ipv6 { } wireless _first_ { - format_up = "W:%quality %ip" + format_up = "%essid:%quality %ip" format_down = "W: down" } @@ -40,7 +40,9 @@ ethernet _first_ { } battery all { - format = "%status %percentage" + hide_seconds = true + + format = "%status %percentage %remaining" } tztime utc { format = "UTC: %H:%M" diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc index 4d6ae8b..09c0a01 100644 --- a/mbsync/.mbsyncrc +++ b/mbsync/.mbsyncrc @@ -93,50 +93,86 @@ Channel ohmnii-sent #Channel ohmnii-junk -####################################### - -IMAPAccount landmark -Host outlook.office365.com -Port 993 -User tuckerevans@landmark.edu -PassCmd "pass show email/landmark.edu" +########## +#Landmark# +########## +#IMAPAccount landmark +#Host outlook.office365.com +#Port 993 +#User tuckerevans@landmark.edu +#PassCmd "pass show email/landmark.edu" +#SSLType IMAPS +#CertificateFile /etc/ssl/certs/ca-certificates.crt +# +#IMAPStore landmark-remote +#Account landmark +# +#MaildirStore landmark-local +#Path ~/Mail/landmark/ +#Inbox ~/Mail/landmark/inbox +# +#Channel landmark-default +#Master :landmark-remote: +#Slave :landmark-local:inbox +# +#Channel landmark-sent +#Master :landmark-remote:"Sent Items" +#Slave :landmark-local:sent +# +##Channel landmark-trash +##Master :landmark-remote:"Deleted Items" +##Slave :landmark-local:trash +# +##Channel landmark-archive +##Master :landmark-remote:"Archives" +##Slave :landmark-local:all +# +##Channel landmark-junk +##Master :landmark-remote:"Junk Email" +##Slave :landmark-local:junk +# +#Create Both +#Expunge Both +#SyncState * +# +#Group landmark +#Channel landmark-default +##Channel landmark-trash +##Channel landmark-archive +#Channel landmark-sent +##Channel landmark-junk +########################################### + +########## +#Clarkson# +########## +IMAPAccount clarkson +Host imap.gmail.com +User evanst@clarkson.edu +PassCmd "pass show clarkson/app-passwords/mbsync" SSLType IMAPS CertificateFile /etc/ssl/certs/ca-certificates.crt -IMAPStore landmark-remote -Account landmark - -MaildirStore landmark-local -Path ~/Mail/landmark/ -Inbox ~/Mail/landmark/inbox +IMAPStore clarkson-remote +Account clarkson -Channel landmark-default -Master :landmark-remote: -Slave :landmark-local:inbox - -Channel landmark-sent -Master :landmark-remote:"Sent Items" -Slave :landmark-local:sent - -#Channel landmark-trash -#Master :landmark-remote:"Deleted Items" -#Slave :landmark-local:trash +MaildirStore clarkson-local +#The trailing "/" is important +Path ~/Mail/clarkson/ +Inbox ~/Mail/clarkson/inbox -#Channel landmark-archive -#Master :landmark-remote:"Archives" -#Slave :landmark-local:all +Channel clarkson-default +Master :clarkson-remote: +Slave :clarkson-local:inbox -#Channel landmark-junk -#Master :landmark-remote:"Junk Email" -#Slave :landmark-local:junk +Channel clarkson-sent +Master :clarkson-remote:"[Gmail]/Sent Mail" +Slave :clarkson-local:sent Create Both Expunge Both SyncState * -Group landmark -Channel landmark-default -#Channel landmark-trash -#Channel landmark-archive -Channel landmark-sent -#Channel landmark-junk +Group clarkson +Channel clarkson-default +Channel clarkson-sent diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc index 8698c29..4da69b0 100644 --- a/msmtp/.msmtprc +++ b/msmtp/.msmtprc @@ -22,13 +22,23 @@ tls_starttls off user "tucker@ohmnii.com" passwordeval "pass show email/ohmnii.com" -account landmark -host smtp.office365.com -from "tuckerevans@landmark.edu" -port 587 -tls on -tls_starttls on -user "tuckerevans@landmark.edu" -passwordeval "pass show email/landmark.edu" +#account landmark +#host smtp.office365.com +#from "tuckerevans@landmark.edu" +#port 587 +#tls on +#tls_starttls on +#user "tuckerevans@landmark.edu" +#passwordeval "pass show email/landmark.edu" account default : gmail + + +account clarkson +host smtp.gmail.com +port 587 +from "evanst@clarkson.edu" +tls on +tls_starttls on +user "evanst@clarkson.edu" +passwordeval "pass show clarkson/app-passwords/msmtp" diff --git a/mutt/.mutt/clarkson.edu b/mutt/.mutt/clarkson.edu new file mode 100644 index 0000000..f5b376c --- /dev/null +++ b/mutt/.mutt/clarkson.edu @@ -0,0 +1,11 @@ +set from = "evanst@clarkson.edu" +set hostname = "clarkson.edu" +set folder = "~/Mail/clarkson" +set mbox = "~/Mail/clarkson" +set record = "~/Mail/clarkson/sent" +set postponed = "~/Mail/clarkson/Drafts" +set spoolfile = "~/Mail/clarkson/inbox" + +set sendmail = "/usr/bin/msmtp -a clarkson" + +color status black yellow diff --git a/mutt/.muttrc b/mutt/.muttrc index 5629b52..11f52b0 100644 --- a/mutt/.muttrc +++ b/mutt/.muttrc @@ -41,17 +41,19 @@ push <show-version> # Shows mutt version at startup set sort = reverse-date-received -alternative_order text/plain text/html auto_view text/html +alternative_order text/plain text/enriched text/html folder-hook '~/Mail/gmail.com' 'source ~/.mutt/gmail.com' folder-hook '~/Mail/ohmnii.com/inbox' 'source ~/mutt/ohmnii.com' folder-hook '~/Mail/landmark.edu' 'source ~/mutt/landmark.edu' +folder-hook '~/Mail/clarkson.edu' 'source ~/mutt/clarkson.edu macro index <f2> '<sync-mailbox><change-folder>~/Mail/gmail/inbox<enter><enter-command>source ~/.mutt/gmail.com<enter>' macro index <f3> '<sync-mailbox><change-folder>~/Mail/ohmnii/inbox<enter><enter-command>source ~/.mutt/ohmnii.com<enter>' -macro index <f4> '<sync-mailbox><change-folder>~/Mail/landmark/inbox<enter><enter-command>source ~/.mutt/landmark.edu<enter>' +macro index <f4> '<sync-mailbox><change-folder>~/Mail/clarkson/inbox<enter><enter-command>source ~/.mutt/clarkson.edu<enter>' +macro index <f5> '<sync-mailbox><change-folder>~/Mail/landmark/inbox<enter><enter-command>source ~/.mutt/landmark.edu<enter>' # -*-muttrc-*- diff --git a/newsboat/.newsboat/config b/newsboat/.newsboat/config new file mode 100644 index 0000000..25ef17e --- /dev/null +++ b/newsboat/.newsboat/config @@ -0,0 +1,11 @@ +browser "firefox" +player "mpg123" +text-width 74 +download-path "~/podDownloads/%n" +save-path "~/podDownloads" +bind-key j down +bind-key k up +bind-key g home +bind-key G end +bind-key h quit +bind-key l open diff --git a/newsboat/.newsboat/urls b/newsboat/.newsboat/urls new file mode 100644 index 0000000..cd06d97 --- /dev/null +++ b/newsboat/.newsboat/urls @@ -0,0 +1,14 @@ +https://www.troyhunt.com/rss/ +https://rss.simplecast.com/podcasts/4669/rss +http://feeds.gimletmedia.com/hearreplyall +http://feeds.gimletmedia.com/thehabitat +http://feeds.twit.tv/twit.xml +http://feeds.99percentinvisible.org/99percentinvisible +https://www.npr.org/rss/rss.php?id=1001 +https://www.theverge.com/rss/index.xml +http://feeds.arstechnica.com/arstechnica/index +http://feeds.bbci.co.uk/news/rss.xml?edition=us +https://www.voidlinux.eu/atom.xml +https://github.com/voidlinux/void-packages/commits/master.atom +https://github.com/voidlinux/xbps/commits/master.atom + diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 54e496b..b033e6f 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -16,5 +16,3 @@ bind l select-pane -R #set -g status-bg magenta - -set -g mouse on diff --git a/vim/.vim/colors/moonfly.vim b/vim/.vim/colors/moonfly.vim new file mode 100644 index 0000000..3201cfd --- /dev/null +++ b/vim/.vim/colors/moonfly.vim @@ -0,0 +1,511 @@ +" Dark Vim/Neovim color scheme. +" +" Note: Inspiration taken from: monokai, sunburst xoria256 and One Dark themes. +" +" URL: github.com/bluz71/vim-moonfly-colors +" License: MIT (https://opensource.org/licenses/MIT) + +highlight clear +set background=dark +if exists("syntax_on") + syntax reset +endif +let g:colors_name="moonfly" + +" By default highlight cursor line numbers in 'blue'. +" By default don't color the cursor. +" By default use the moonfly color palette in the `:terminal`. +" By default don't underline matching parentheses. +let g:moonflyCursorLineNr = get(g:, "moonflyCursorLineNr", 1) +let g:moonflyCursorColor = get(g:, "moonflyCursorColor", 0) +let g:moonflyTerminalColors = get(g:, "moonflyTerminalColors", 1) +let g:moonflyUnderlineMatchParen = get(g:, "moonflyUnderlineMatchParen", 0) + +let s:black = "#080808" " black = 232 +let s:white = "#c6c6c6" " white = 251 +let s:grey0 = "#373c40" " grey0 = 0 +let s:grey249 = "#b2b2b2" " grey249 = 249 +let s:grey247 = "#9e9e9e" " grey247 = 247 +let s:grey237 = "#3a3a3a" " grey237 = 237 +let s:grey236 = "#303030" " grey236 = 236 +let s:grey235 = "#262626" " grey235 = 235 +let s:grey234 = "#1c1c1c" " grey234 = 234 +let s:grey233 = "#121212" " grey233 = 233 +let s:wheat = "#cfcfb0" " wheat = 11 +let s:khaki = "#e3c78a" " khaki = 3 +let s:orange = "#de935f" " orange = 7 +let s:coral = "#f09479" " coral = 8 +let s:light_green = "#85dc85" " light_green = 14 +let s:green = "#8cc85f" " green = 2 +let s:emerald = "#42cf89" " emerald = 10 +let s:blue = "#80a0ff" " blue = 4 +let s:blue69 = "#528bff" " blue69 = 69 +let s:blue111 = "#87afff" " blue111 = 111 +let s:light_blue = "#78c2ff" " light_blue = 12 +let s:turquoise = "#7ee0ce" " turquoise = 6 +let s:purple = "#ae81ff" " purple = 13 +let s:violet = "#e2637f" " violet = 15 +let s:magenta = "#ce76e8" " magenta = 5 +let s:crimson = "#f74782" " crimson = 9 +let s:red = "#ff5454" " red = 1 + +" Specify the the colors used by the inbuilt terminal of Neovim and Vim. +if g:moonflyTerminalColors + if has("nvim") + let g:terminal_color_0 = "#373c40" + let g:terminal_color_1 = "#ff5454" + let g:terminal_color_2 = "#8cc85f" + let g:terminal_color_3 = "#e3c78a" + let g:terminal_color_4 = "#80a0ff" + let g:terminal_color_5 = "#ce76e8" + let g:terminal_color_6 = "#7ee0ce" + let g:terminal_color_7 = "#de935f" + let g:terminal_color_8 = "#f09479" + let g:terminal_color_9 = "#f74782" + let g:terminal_color_10 = "#42cf89" + let g:terminal_color_11 = "#cfcfb0" + let g:terminal_color_12 = "#78c2ff" + let g:terminal_color_13 = "#ae81ff" + let g:terminal_color_14 = "#85dc85" + let g:terminal_color_15 = "#e2637f" + else + let g:terminal_ansi_colors = [ + \ "#373c40", "#ff5454", "#8cc85f", "#e3c78a", + \ "#80a0ff", "#ce76e8", "#7ee0ce", "#de935f", + \ "#f09479", "#f74782", "#42cf89", "#cfcfb0", + \ "#78c2ff", "#ae81ff", "#85dc85", "#e2637f" + \] + endif +endif + +" Background and text. +exec "highlight Normal ctermbg=232 guibg=" . s:black . " ctermfg=251 guifg=" . s:white + +" Color of mode text, -- INSERT -- +exec "highlight ModeMsg ctermfg=247 guifg=" . s:grey247 . " gui=none" + +" Comments. +exec "highlight Comment ctermfg=247 guifg=" . s:grey247 + +" Functions. +exec "highlight Function ctermfg=12 guifg=" . s:light_blue + +" Strings. +exec "highlight String ctermfg=11 guifg=" . s:wheat + +" Identifiers. +exec "highlight Identifier ctermfg=116 guifg=" . s:turquoise + +" Color of titles, e.g in HTML files and Tagbar. +exec "highlight Title ctermfg=7 guifg=" . s:orange . " gui=none" + +" const, static. +exec "highlight StorageClass ctermfg=8 guifg=" . s:coral + +" void, intptr_t. +exec "highlight Type ctermfg=10 guifg=" . s:emerald . " gui=none" + +" Numbers. +exec "highlight Constant ctermfg=13 guifg=" . s:purple + +" ifdef/endif. +exec "highlight PreProc ctermfg=15 guifg=" . s:violet + +" Status, split and tab lines. +exec "highlight StatusLine ctermbg=236 guibg=" . s:grey236 . " ctermfg=251 guifg=" . s:white . " cterm=none gui=none" +exec "highlight StatusLineNC ctermbg=236 guibg=" . s:grey236 . " ctermfg=247 guifg=" . s:grey247 . " cterm=none gui=none" +exec "highlight VertSplit ctermbg=236 guibg=" . s:grey236 . " ctermfg=236 guifg=" . s:grey236 +exec "highlight Tabline ctermbg=236 guibg=" . s:grey236 . " ctermfg=247 guifg=" . s:grey247 . " cterm=none gui=none" +exec "highlight TablineSel ctermbg=236 guibg=" . s:grey236 . " ctermfg=4 guifg=" . s:blue . " cterm=none gui=none" +exec "highlight TablineFill ctermbg=236 guibg=" . s:grey236 . " ctermfg=236 guifg=" . s:grey236 +exec "highlight StatusLineTerm ctermbg=236 guibg=" . s:grey236 . " ctermfg=251 guifg=" . s:white . " cterm=none gui=none" +exec "highlight StatusLineTermNC ctermbg=236 guibg=" . s:grey236 . " ctermfg=247 guifg=" . s:grey247 . " cterm=none gui=none" + +" case in switch statement. +exec "highlight Label ctermfg=6 guifg=" . s:turquoise + +" end-of-line '$', end-of-file '~' +exec "highlight NonText ctermfg=7 guifg=" . s:orange . " gui=none" + +" sizeof +exec "highlight Operator ctermfg=15 guifg=" . s:violet + +" for, while. +exec "highlight Repeat ctermfg=7 guifg=" . s:orange + +" Search. +exec "highlight Search cterm=reverse gui=reverse ctermbg=bg guibg=bg ctermfg=7 guifg=" . s:orange +exec "highlight IncSearch ctermbg=bg guibg=bg ctermfg=3 guifg=" . s:khaki + +" '\n' sequences. +exec "highlight Special ctermfg=15 guifg=" . s:violet + +" if, else. +exec "highlight Statement ctermfg=5 guifg=" . s:magenta . " gui=none" + +" Visual selection. +exec "highlight Visual ctermbg=0 guibg=" . s:grey0 +exec "highlight VisualNOS ctermbg=0 guibg=" . s:grey0 . " ctermfg=fg guifg=fg cterm=none gui=none" +exec "highlight VisualInDiff ctermbg=0 guibg=" . s:grey0 . " ctermfg=251 guifg=" . s:white + +" Exceptions. +exec "highlight Exception ctermfg=14 guifg=" . s:light_green + +" Errors, warnings and whitespace-eol. +exec "highlight Error ctermbg=bg guibg=bg ctermfg=1 guifg=" . s:red +exec "highlight ErrorMsg ctermbg=bg guibg=bg ctermfg=1 guifg=" . s:red +exec "highlight WarningMsg ctermbg=bg guibg=bg ctermfg=7 guifg=" . s:orange + +" struct, union, enum, typedef. +exec "highlight Structure ctermfg=10 guifg=" . s:emerald + +" Auto-text-completion menu. +exec "highlight Pmenu ctermbg=236 guibg=" . s:grey236 . " ctermfg=fg guifg=fg" +exec "highlight PmenuSel ctermbg=2 guibg=" . s:green . " ctermfg=236 guifg=" . s:grey236 +exec "highlight PmenuThumb ctermbg=3 guibg=" . s:khaki +exec "highlight WildMenu ctermbg=2 guibg=" . s:green . " ctermfg=236 guifg=" . s:grey236 + +" Spelling errors. +exec "highlight SpellBad ctermbg=bg ctermfg=1 cterm=underline guibg=bg guifg=" . s:red . " gui=underline guisp=" . s:red +exec "highlight SpellCap ctermbg=bg ctermfg=4 cterm=underline guibg=bg guifg=" . s:blue . " gui=underline guisp=" . s:blue +exec "highlight SpellRare ctermbg=bg ctermfg=15 cterm=underline guibg=bg guifg=" . s:violet . " gui=underline guisp=" . s:violet +exec "highlight SpellLocal ctermbg=bg ctermfg=12 cterm=underline guibg=bg guifg=" . s:light_blue . " gui=underline guisp=" . s:light_blue + +" Misc. +exec "highlight Question ctermfg=14 guifg=" . s:light_green . " gui=none" +exec "highlight MoreMsg ctermfg=1 guifg=" . s:red . " gui=none" +exec "highlight LineNr ctermbg=234 guibg=" . s:grey234 . " ctermfg=247 guifg=" . s:grey247 +if g:moonflyCursorColor + exec "highlight Cursor ctermfg=bg ctermbg=69 guifg=bg guibg=" . s:blue69 +else + exec "highlight Cursor ctermfg=bg ctermbg=247 guifg=bg guibg=" . s:grey247 +endif +exec "highlight lCursor ctermfg=bg ctermbg=247 guifg=bg guibg=" . s:grey247 +if g:moonflyCursorLineNr + exec "highlight CursorLineNr ctermbg=234 guibg=" . s:grey234 . " ctermfg=4 guifg=" . s:blue . " gui=none" +else + exec "highlight CursorLineNr ctermbg=234 guibg=" . s:grey234 . " ctermfg=247 guifg=" . s:grey247 . " gui=none" +endif +exec "highlight CursorColumn ctermbg=234 guibg=" . s:grey234 . " cterm=none" +exec "highlight CursorLine ctermbg=234 guibg=" . s:grey234 . " cterm=none" +exec "highlight Folded ctermbg=234 guibg=" . s:grey234 . " ctermfg=14 guifg=". s:light_green +exec "highlight FoldColumn ctermbg=236 guibg=" . s:grey236 . " ctermfg=14 guifg=" . s:light_green +exec "highlight SignColumn ctermbg=236 guibg=" . s:grey236 . " ctermfg=14 guifg=" . s:light_green +exec "highlight Todo ctermbg=3 guibg=" . s:khaki . " ctermfg=bg guifg=bg" +exec "highlight SpecialKey ctermbg=bg guibg=bg ctermfg=12 guifg=" . s:light_blue +if g:moonflyUnderlineMatchParen + exec "highlight MatchParen ctermbg=bg guibg=bg ctermfg=9 guifg=" . s:crimson . " cterm=underline gui=underline" +else + exec "highlight MatchParen ctermbg=bg guibg=bg ctermfg=9 guifg=" . s:crimson +endif +exec "highlight Ignore ctermfg=12 guifg=" . s:light_blue +exec "highlight Underlined ctermfg=10 guifg=" . s:emerald . " cterm=none gui=none" +exec "highlight QuickFixLine ctermbg=237 guibg=" . s:grey237 . " cterm=none" +exec "highlight Delimiter ctermfg=11 guifg=" . s:wheat + +" Neovim only highlight groups. +exec "highlight Whitespace ctermfg=235 guifg=" . s:grey235 +exec "highlight TermCursor ctermbg=247 guibg=" . s:grey247 . " ctermfg=bg guifg=bg cterm=none gui=none" + +" Color column (after line 80). +exec "highlight ColorColumn ctermbg=233 guibg=" . s:grey233 + +" Conceal color, as used by indentLine plugin. +exec "highlight Conceal ctermbg=bg guibg=bg ctermfg=235 guifg=" . s:grey235 + +" For C/C++. +" +" goto, break, return, continue. +exec "highlight cStatement ctermfg=6 guifg=" . s:turquoise +" new, delete, this, using. +exec "highlight cppStatement ctermfg=9 guifg=" . s:crimson +" [static/const/dynamic]_cast. +exec "highlight cppCast ctermfg=10 guifg=" . s:emerald +" public, private. +exec "highlight cppAccess ctermfg=14 guifg=" . s:light_green +" operator. +exec "highlight cppOperator ctermfg=2 guifg=" . s:green +" inline, virtual, explicit, export, bool. +exec "highlight cppType ctermfg=3 guifg=" . s:khaki +" class, typename, template, namespace. +exec "highlight cppStructure ctermfg=4 guifg=" . s:blue +" true or false. +exec "highlight cppBoolean ctermfg=13 guifg=" . s:purple + +" For shell scripts. +exec "highlight shStatement ctermfg=fg guifg=fg" +exec "highlight shCommandSub ctermfg=fg guifg=fg" +exec "highlight shSet ctermfg=14 guifg=" . s:light_green +exec "highlight shShellVariables ctermfg=8 guifg=" . s:coral +exec "highlight shVariable ctermfg=6 guifg=" . s:turquoise +exec "highlight shAlias ctermfg=6 guifg=" . s:turquoise +exec "highlight shSetList ctermfg=6 guifg=" . s:turquoise + +" For Python. +exec "highlight pythonBuiltin ctermfg=4 guifg=" . s:blue +exec "highlight pythonCoding ctermfg=12 guifg=" . s:light_blue +exec "highlight pythonException ctermfg=9 guifg=" . s:crimson +exec "highlight pythonImport ctermfg=15 guifg=" . s:violet +exec "highlight pythonOperator ctermfg=7 guifg=" . s:orange +exec "highlight pythonRepeat ctermfg=7 guifg=" . s:orange +exec "highlight pythonRun ctermfg=12 guifg=" . s:light_blue +exec "highlight pythonStatement ctermfg=5 guifg=" s:magenta + +" For Ruby. +exec "highlight erubyDelimiter ctermfg=9 guifg=" . s:crimson +exec "highlight rspecGroupMethods ctermfg=4 guifg=" . s:blue +exec "highlight rubyAccess ctermfg=3 guifg=" . s:khaki +exec "highlight rubyAttribute ctermfg=12 guifg=" . s:light_blue +exec "highlight rubyBlockParameter ctermfg=2 guifg=" . s:green +exec "highlight rubyBoolean ctermfg=6 guifg=" . s:turquoise +exec "highlight rubyCallback ctermfg=12 guifg=" . s:light_blue +exec "highlight rubyClass ctermfg=7 guifg=" . s:orange +exec "highlight rubyControl ctermfg=8 guifg=" . s:coral +exec "highlight rubyDefine ctermfg=5 guifg=" . s:magenta +exec "highlight rubyEntities ctermfg=12 guifg=" . s:light_blue +exec "highlight rubyException ctermfg=9 guifg=" . s:crimson +exec "highlight rubyExceptional ctermfg=8 guifg=" . s:coral +exec "highlight rubyInstanceVariable ctermfg=14 guifg=" . s:light_green +exec "highlight rubyInterpolationDelimiter ctermfg=15 guifg=" . s:violet +exec "highlight rubyMacro ctermfg=12 guifg=" . s:light_blue +exec "highlight rubyModule ctermfg=4 guifg=" . s:blue +exec "highlight rubyPseudoVariable ctermfg=2 guifg=" . s:green +exec "highlight rubyResponse ctermfg=6 guifg=" . s:turquoise +exec "highlight rubyRoute ctermfg=12 guifg=" . s:light_blue +exec "highlight rubySharpBang ctermfg=247 guifg=" . s:grey247 +exec "highlight rubyStringDelimiter ctermfg=11 guifg=" . s:wheat + +" For Crystal. +exec "highlight crystalAccess ctermfg=3 guifg=" . s:khaki +exec "highlight crystalAttribute ctermfg=12 guifg=" . s:light_blue +exec "highlight crystalBlockParameter ctermfg=2 guifg=" . s:green +exec "highlight crystalBoolean ctermfg=6 guifg=" . s:turquoise +exec "highlight crystalClass ctermfg=7 guifg=" . s:orange +exec "highlight crystalControl ctermfg=8 guifg=" . s:coral +exec "highlight crystalDefine ctermfg=5 guifg=" . s:magenta +exec "highlight crystalException ctermfg=9 guifg=" . s:crimson +exec "highlight crystalExceptional ctermfg=8 guifg=" . s:coral +exec "highlight crystalInstanceVariable ctermfg=14 guifg=" . s:light_green +exec "highlight crystalModule ctermfg=4 guifg=" . s:blue +exec "highlight crystalPseudoVariable ctermfg=2 guifg=" . s:green +exec "highlight crystalSharpBang ctermfg=247 guifg=" . s:grey247 +exec "highlight crystalStringDelimiter ctermfg=11 guifg=" . s:wheat + +" For Elixir. +exec "highlight eelixirDelimiter ctermfg=9 guifg=" . s:crimson +exec "highlight elixirBlockDefinition ctermfg=5 guifg=" . s:magenta +exec "highlight elixirBoolean ctermfg=6 guifg=" . s:turquoise +exec "highlight elixirDefine ctermfg=5 guifg=" . s:magenta +exec "highlight elixirDocTest ctermfg=247 guifg=" . s:grey247 +exec "highlight elixirExUnitAssert ctermfg=14 guifg=" . s:light_green +exec "highlight elixirExUnitMacro ctermfg=12 guifg=" . s:light_blue +exec "highlight elixirKernelFunction ctermfg=2 guifg=" . s:green +exec "highlight elixirKeyword ctermfg=7 guifg=" . s:orange +exec "highlight elixirModuleDefine ctermfg=4 guifg=" . s:blue +exec "highlight elixirPrivateDefine ctermfg=5 guifg=" . s:magenta +exec "highlight elixirStringDelimiter ctermfg=11 guifg=" . s:wheat +exec "highlight elixirVariable ctermfg=8 guifg=" . s:coral + +" For JavaScript 'pangloss/vim-javascript' plugin. +exec "highlight jsClassDefinition ctermfg=10 guifg=" . s:emerald +exec "highlight jsClassKeyword ctermfg=7 guifg=" . s:orange +exec "highlight jsFrom ctermfg=8 guifg=" . s:coral +exec "highlight jsFuncBlock ctermfg=10 guifg=" . s:emerald +exec "highlight jsFuncCall ctermfg=12 guifg=" . s:light_blue +exec "highlight jsFunction ctermfg=14 guifg=" . s:light_green +exec "highlight jsGlobalObjects ctermfg=10 guifg=" . s:emerald +exec "highlight jsModuleAs ctermfg=8 guifg=" . s:coral +exec "highlight jsObjectKey ctermfg=12 guifg=" . s:light_blue +exec "highlight jsObjectValue ctermfg=10 guifg=" . s:emerald +exec "highlight jsOperator ctermfg=5 guifg=" . s:magenta +exec "highlight jsStorageClass ctermfg=14 guifg=" . s:light_green +exec "highlight jsTemplateBraces ctermfg=15 guifg=" . s:violet +exec "highlight jsTemplateExpression ctermfg=6 guifg=" . s:turquoise +exec "highlight jsThis ctermfg=2 guifg=" . s:green + +" For CoffeeScript +exec "highlight coffeeBoolean ctermfg=6 guifg=" . s:turquoise +exec "highlight coffeeException ctermfg=9 guifg=" . s:crimson +exec "highlight coffeeGlobal ctermfg=6 guifg=" . s:turquoise +exec "highlight coffeeKeyword ctermfg=7 guifg=" . s:orange +exec "highlight coffeeObjAssign ctermfg=12 guifg=" . s:light_blue +exec "highlight coffeeSpecialIdent ctermfg=14 guifg=" . s:light_green +exec "highlight coffeeSpecialVar ctermfg=4 guifg=" . s:blue +exec "highlight coffeeStatement ctermfg=8 guifg=" . s:coral + +" For Go. +exec "highlight goBuiltins ctermfg=9 guifg=" . s:crimson +exec "highlight goConditional ctermfg=5 guifg=" . s:magenta +exec "highlight goDeclaration ctermfg=14 guifg=" . s:light_green +exec "highlight goDeclType ctermfg=2 guifg=" . s:green +exec "highlight goDirective ctermfg=15 guifg=" . s:violet +exec "highlight goFloats ctermfg=13 guifg=" . s:purple +exec "highlight goFunction ctermfg=4 guifg=" . s:blue +exec "highlight goFunctionCall ctermfg=12 guifg=" . s:light_blue +exec "highlight goImport ctermfg=15 guifg=" . s:violet +exec "highlight goLabel ctermfg=3 guifg=" . s:khaki +exec "highlight goMethod ctermfg=12 guifg=" . s:light_blue +exec "highlight goMethodCall ctermfg=12 guifg=" . s:light_blue +exec "highlight goPackage ctermfg=15 guifg=" . s:violet +exec "highlight goRepeat ctermfg=7 guifg=" . s:orange +exec "highlight goSignedInts ctermfg=13 guifg=" . s:purple +exec "highlight goStatement ctermfg=3 guifg=" . s:khaki +exec "highlight goStruct ctermfg=8 guifg=" . s:coral +exec "highlight goStructDef ctermfg=8 guifg=" . s:coral +exec "highlight goUnsignedInts ctermfg=13 guifg=" . s:purple + +" For Rust. +exec "highlight rustCharacterInvalid ctermfg=15 guifg=" . s:violet +exec "highlight rustCharacterInvalidUnicode ctermfg=15 guifg=" . s:violet +exec "highlight rustCommentBlockDoc ctermfg=247 guifg=" . s:grey247 +exec "highlight rustCommentBlockDocError ctermfg=247 guifg=" . s:grey247 +exec "highlight rustCommentLineDoc ctermfg=247 guifg=" . s:grey247 +exec "highlight rustCommentLineDocError ctermfg=247 guifg=" . s:grey247 +exec "highlight rustConstant ctermfg=7 guifg=" . s:orange +exec "highlight rustEscapeError ctermfg=15 guifg=" . s:violet +exec "highlight rustFuncName ctermfg=4 guifg=" . s:blue +exec "highlight rustIdentifier ctermfg=4 guifg=" . s:blue +exec "highlight rustInvalidBareKeyword ctermfg=15 guifg=" . s:violet +exec "highlight rustKeyword ctermfg=14 guifg=" . s:light_green +exec "highlight rustLifetime ctermfg=2 guifg=" . s:green +exec "highlight rustMacro ctermfg=4 guifg=" . s:blue +exec "highlight rustMacroVariable ctermfg=5 guifg=" . s:magenta +exec "highlight rustModPath ctermfg=12 guifg=" . s:light_blue +exec "highlight rustObsoleteExternMod ctermfg=15 guifg=" . s:violet +exec "highlight rustObsoleteStorage ctermfg=15 guifg=" . s:violet +exec "highlight rustReservedKeyword ctermfg=15 guifg=" . s:violet +exec "highlight rustSelf ctermfg=2 guifg=" . s:green +exec "highlight rustStructure ctermfg=7 guifg=" . s:orange +exec "highlight rustTrait ctermfg=10 guifg=" . s:emerald +exec "highlight rustType ctermfg=8 guifg=" . s:coral + +" For Java. +exec "highlight javaBraces ctermfg=251 guifg=" . s:white +exec "highlight javaClassDecl ctermfg=10 guifg=" . s:emerald +exec "highlight javaCommentTitle ctermfg=247 guifg=" . s:grey247 +exec "highlight javaConstant ctermfg=12 guifg=" . s:light_blue +exec "highlight javaDebug ctermfg=12 guifg=" . s:light_blue +exec "highlight javaMethodDecl ctermfg=3 guifg=" . s:khaki +exec "highlight javaOperator ctermfg=9 guifg=" . s:crimson +exec "highlight javaScopeDecl ctermfg=4 guifg=" . s:blue +exec "highlight javaStatement ctermfg=6 guifg=" . s:turquoise + +" For HTML. +exec "highlight htmlArg ctermfg=12 guifg=" . s:light_blue +exec "highlight htmlBoldItalic ctermbg=232 guibg=" . s:black . " ctermfg=8 guifg=" . s:coral " cterm=none gui=none" +exec "highlight htmlBoldUnderlineItalic ctermbg=232 guibg=" . s:black . " ctermfg=8 guifg=" . s:coral +exec "highlight htmlItalic ctermbg=232 guibg=" . s:black . " ctermfg=247 guifg=" . s:grey247 " cterm=none gui=none" +exec "highlight htmlLink ctermfg=2 guifg=" . s:green +exec "highlight htmlEndTag ctermfg=13 guifg=" . s:purple +exec "highlight htmlTag ctermfg=14 guifg=" . s:light_green +exec "highlight htmlTagN ctermfg=4 guifg=" . s:blue +exec "highlight htmlTagName ctermfg=4 guifg=" . s:blue +exec "highlight htmlUnderlineItalic ctermbg=232 guibg=" . s:black . " ctermfg=247 guifg=" . s:grey247 + +" For XML. +exec "highlight xmlAttrib ctermfg=14 guifg=" . s:light_green +exec "highlight xmlEndTag ctermfg=4 guifg=" . s:blue +exec "highlight xmlTag ctermfg=14 guifg=" . s:light_green +exec "highlight xmlTagName ctermfg=4 guifg=" . s:blue + +" For Markdown 'plasticboy/vim-markdown' plugin. +exec "highlight mkdLineBreak ctermbg=bg guibg=bg" +exec "highlight mkdListItem ctermfg=4 guifg=" . s:blue +exec "highlight mkdURL ctermfg=13 guifg=" . s:purple + +" For vimdiff. +exec "highlight DiffAdd ctermbg=10 guibg=" . s:emerald . " ctermfg=bg guifg=bg" +exec "highlight DiffChange ctermbg=236 guibg=" . s:grey236 +exec "highlight DiffDelete ctermbg=236 guibg=" . s:grey236 . " ctermfg=9 guifg=" . s:crimson " gui=none" +exec "highlight DiffText ctermbg=4 guibg=" . s:blue . " ctermfg=bg guifg=bg gui=none" + +" For Git Commits. +exec "highlight gitCommitBranch ctermfg=12 guifg=" . s:light_blue +exec "highlight gitCommitHeader ctermfg=13 guifg=" . s:purple +exec "highlight gitCommitSelectedFile ctermfg=10 guifg=" . s:emerald +exec "highlight gitCommitSelectedType ctermfg=12 guifg=" . s:light_blue +exec "highlight gitCommitDiscardedFile ctermfg=9 guifg=" . s:crimson +exec "highlight gitCommitDiscardedType ctermfg=12 guifg=" . s:light_blue + +" For vim files. +exec "highlight vimBracket ctermfg=12 guifg=" . s:light_blue +exec "highlight vimCommand ctermfg=7 guifg=" . s:orange +exec "highlight vimEnvvar ctermfg=9 guifg=" . s:crimson +exec "highlight vimFuncName ctermfg=4 guifg=" . s:blue +exec "highlight vimFuncSID ctermfg=12 guifg=" . s:light_blue +exec "highlight vimFunction ctermfg=12 guifg=" . s:light_blue +exec "highlight vimNotation ctermfg=12 guifg=" . s:light_blue +exec "highlight vimOption ctermfg=10 guifg=" . s:emerald +exec "highlight vimParenSep ctermfg=251 guifg=" . s:white +exec "highlight vimSep ctermfg=251 guifg=" . s:white +exec "highlight vimUserFunc ctermfg=12 guifg=" . s:light_blue + +" For Tagbar. +exec "highlight TagbarFoldIcon ctermfg=247 guifg=" . s:grey247 +exec "highlight TagbarVisibilityPublic ctermfg=14 guifg=" . s:light_green +exec "highlight TagbarVisibilityProtected ctermfg=14 guifg=" . s:light_green +exec "highlight TagbarVisibilityPrivate ctermfg=14 guifg=" . s:light_green +exec "highlight TagbarKind ctermfg=10 guifg=" . s:emerald + +" For NERDTree. +exec "highlight NERDTreeClosable ctermfg=8 guifg=" . s:coral +exec "highlight NERDTreeCWD ctermfg=5 guifg=" . s:magenta +exec "highlight NERDTreeDir ctermfg=12 guifg=" . s:light_blue +exec "highlight NERDTreeDirSlash ctermfg=15 guifg=" . s:violet +exec "highlight NERDTreeExecFile ctermfg=11 guifg=" . s:wheat +exec "highlight NERDTreeGitStatusDirDirty ctermfg=13 guifg=" . s:purple +exec "highlight NERDTreeGitStatusModified ctermfg=9 guifg=" . s:crimson +exec "highlight NERDTreeGitStatusRenamed ctermfg=3 guifg=" . s:khaki +exec "highlight NERDTreeGitStatusStaged ctermfg=10 guifg=" . s:emerald +exec "highlight NERDTreeGitStatusUntracked ctermfg=9 guifg=" . s:crimson +exec "highlight NERDTreeHelp ctermfg=247 guifg=" . s:grey247 +exec "highlight NERDTreeLinkDir ctermfg=4 guifg=" . s:blue +exec "highlight NERDTreeLinkFile ctermfg=4 guifg=" . s:blue +exec "highlight NERDTreeOpenable ctermfg=2 guifg=" . s:green +exec "highlight NERDTreePart ctermfg=0 guifg=" . s:grey0 +exec "highlight NERDTreePartFile ctermfg=0 guifg=" . s:grey0 +exec "highlight NERDTreeUp ctermfg=8 guifg=" . s:coral + +" For Neomake. +exec "highlight NeomakeError ctermfg=1 guifg=" . s:red +exec "highlight NeomakeErrorSign ctermbg=236 guibg=" . s:grey236 . " ctermfg=1 guifg=" . s:red +exec "highlight NeomakeWarning ctermfg=3 guifg=" . s:khaki +exec "highlight NeomakeWarningSign ctermbg=236 guibg=" . s:grey236 . " ctermfg=3 guifg=" . s:khaki +exec "highlight NeomakeInfo ctermfg=7 guifg=" . s:orange +exec "highlight NeomakeInfoSign ctermbg=236 guibg=" . s:grey236 . " ctermfg=7 guifg=" . s:orange +exec "highlight NeomakeMessage ctermfg=13 guifg=" . s:purple +exec "highlight NeomakeMessageSign ctermbg=236 guibg=" . s:grey236 . " ctermfg=13 guifg=" . s:purple + +" For FZF. +exec "highlight fzf1 ctermfg=9 guifg=" . s:crimson . " ctermbg=236 guibg=" . s:grey236 +exec "highlight fzf2 ctermfg=111 guifg=" . s:blue111 . " ctermbg=236 guibg=" . s:grey236 +exec "highlight fzf3 ctermfg=10 guifg=" . s:emerald . " ctermbg=236 guibg=" . s:grey236 +exec "highlight fzfNormal ctermfg=249 guifg=" . s:grey249 +let g:fzf_colors = { + \ 'fg': ['fg', 'fzfNormal'], + \ 'bg': ['bg', 'Normal'], + \ 'hl': ['fg', 'Number'], + \ 'fg+': ['fg', 'Normal'], + \ 'bg+': ['bg', 'LineNr'], + \ 'hl+': ['fg', 'Number'], + \ 'info': ['fg', 'Type'], + \ 'border': ['fg', 'CursorLineNr'], + \ 'prompt': ['fg', 'fzf2'], + \ 'pointer': ['fg', 'MatchParen'], + \ 'marker': ['fg', 'StorageClass'], + \ 'spinner': ['fg', 'Type'], + \ 'header': ['fg', 'CursorLineNr'] + \} + +" Misc. +exec "highlight bufExplorerHelp ctermfg=247 guifg=" . s:grey247 +exec "highlight bufExplorerSortBy ctermfg=247 guifg=" . s:grey247 +exec "highlight CleverFDefaultLabel ctermfg=9 guifg=" . s:crimson +exec "highlight CtrlPMatch ctermfg=13 guifg=" . s:purple +exec "highlight Directory ctermfg=10 guifg=" . s:emerald +exec "highlight HighlightedyankRegion ctermbg=0 guibg=" . s:grey0 +exec "highlight jsonKeyword ctermfg=12 guifg=" . s:light_blue +exec "highlight netrwClassify ctermfg=15 guifg=" . s:violet +exec "highlight netrwDir ctermfg=12 guifg=" . s:light_blue +exec "highlight snipLeadingSpaces ctermbg=bg guibg=bg ctermfg=fg guifg=fg" +exec "highlight tagName ctermfg=6 guifg=" . s:turquoise diff --git a/vim/.vim/after/ftplugin/asm.vim b/vim/.vim/ftplugin/asm.vim index e69de29..e69de29 100644 --- a/vim/.vim/after/ftplugin/asm.vim +++ b/vim/.vim/ftplugin/asm.vim diff --git a/vim/.vim/after/ftplugin/by.vim b/vim/.vim/ftplugin/by.vim index 7f2b61c..7f2b61c 100644 --- a/vim/.vim/after/ftplugin/by.vim +++ b/vim/.vim/ftplugin/by.vim diff --git a/vim/.vim/after/ftplugin/c.vim b/vim/.vim/ftplugin/c.vim index 736e482..a445f6f 100644 --- a/vim/.vim/after/ftplugin/c.vim +++ b/vim/.vim/ftplugin/c.vim @@ -1,2 +1,3 @@ set tw=0 set cindent +set nospell diff --git a/vim/.vim/ftplugin/conf.vim b/vim/.vim/ftplugin/conf.vim new file mode 100644 index 0000000..7f2b61c --- /dev/null +++ b/vim/.vim/ftplugin/conf.vim @@ -0,0 +1,2 @@ +set nospell +set tw=0 diff --git a/vim/.vim/after/ftplugin/go.vim b/vim/.vim/ftplugin/go.vim index 736e482..736e482 100644 --- a/vim/.vim/after/ftplugin/go.vim +++ b/vim/.vim/ftplugin/go.vim diff --git a/vim/.vim/after/ftplugin/java.vim b/vim/.vim/ftplugin/java.vim index 736e482..736e482 100644 --- a/vim/.vim/after/ftplugin/java.vim +++ b/vim/.vim/ftplugin/java.vim diff --git a/vim/.vim/ftplugin/mail.vim b/vim/.vim/ftplugin/mail.vim new file mode 100644 index 0000000..c6e2b8a --- /dev/null +++ b/vim/.vim/ftplugin/mail.vim @@ -0,0 +1,3 @@ +set softtabstop=4 +set shiftwidth=4 +set expandtab diff --git a/vim/.vim/ftplugin/python.vim b/vim/.vim/ftplugin/python.vim new file mode 100644 index 0000000..643e63d --- /dev/null +++ b/vim/.vim/ftplugin/python.vim @@ -0,0 +1,7 @@ +set nospell +set tw=0 +set tabstop=8 +set softtabstop=8 +set shiftwidth=8 +set noexpandtab + diff --git a/vim/.vim/after/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim index 87f4512..87f4512 100644 --- a/vim/.vim/after/ftplugin/tex.vim +++ b/vim/.vim/ftplugin/tex.vim diff --git a/vim/.vim/after/ftplugin/tr.vim b/vim/.vim/ftplugin/tr.vim index 87f4512..87f4512 100644 --- a/vim/.vim/after/ftplugin/tr.vim +++ b/vim/.vim/ftplugin/tr.vim diff --git a/vim/.vim/ftplugin/tree.vim b/vim/.vim/ftplugin/tree.vim new file mode 100644 index 0000000..073abf6 --- /dev/null +++ b/vim/.vim/ftplugin/tree.vim @@ -0,0 +1,13 @@ +set tw=0 +set nolist +set nospell + +map pp a, 01<esc> +map PP a, 09<esc> +map tt a, 06<esc> +map bb a, 07<esc> +map ss a, 03<esc> +map SS a, 04<esc> +map nn a, 05<esc> +map vv a, 02<esc> +map cc a, Cull<esc> diff --git a/vim/.vim/after/ftplugin/txt.vim b/vim/.vim/ftplugin/txt.vim index 7dcafeb..7dcafeb 100644 --- a/vim/.vim/after/ftplugin/txt.vim +++ b/vim/.vim/ftplugin/txt.vim diff --git a/vim/.vim/pack/tje/opt/nerdtree b/vim/.vim/pack/tje/opt/nerdtree -Subproject 68572ef46143c5c7d420a6ec86f1ec4595765ce +Subproject 35953042fbf5535a7e905b52a6973c3f7f8a553 diff --git a/vim/.vim/pack/tje/start/vim-gitgutter b/vim/.vim/pack/tje/start/vim-gitgutter -Subproject 932ffaca092cca246b82c33e23d2d3a05e192e0 +Subproject a7206c41fc174f576b3f7085d48319dbdad760a diff --git a/vim/.vim/pack/tje/start/vim-go b/vim/.vim/pack/tje/start/vim-go new file mode 160000 +Subproject 4d7dbea42fa58e99c48e3dfabdb5afdeadd3d34 diff --git a/vim/.vim/pack/tje/start/vim-ledger b/vim/.vim/pack/tje/start/vim-ledger new file mode 160000 +Subproject 6eb3bb21aa979cc295d0480b2179938c12b33d0 @@ -18,8 +18,16 @@ set listchars=eol:\ ,tab:\|\ ,trail:~,extends:>,precedes:<,space:ยท map K i<enter><esc> map W <esc>:WordCount<enter> -colorscheme default +colorscheme moonfly au BufRead,BufNewFile *.go set filetype=go +au BufRead,BufNewFile *.ldg set filetype=ledger -set statusline+=%{WordCount#WordCount()} +function LedgerSort() + :%! ledger -f - print --sort 'date, amount' + :%LedgerAlign + :%s/^ /\t/g +endfunction +command LedgerSort call LedgerSort() + +filetype plugin on |