aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules13
-rw-r--r--files/.mutt/colors52
-rw-r--r--files/.mutt/folder-hooks.default2
m---------files/.mutt/mutt-colors-solarized0
m---------files/.vim/bundle/vim-ledger0
-rw-r--r--files/.vim/ftplugin/ledger.vim2
-rw-r--r--files/.vim/snippets/ledger.snippets4
-rw-r--r--files/.vimrc4
-rw-r--r--files/.zsh/rc/S50_aliases6
-rw-r--r--files/.zsh/rc/S51_ledger14
m---------files/bin0
11 files changed, 65 insertions, 32 deletions
diff --git a/.gitmodules b/.gitmodules
index 02f252a..d296718 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,10 @@
[submodule "zsh-completions"]
path = files/.zsh/zsh-completions
url = https://github.com/zsh-users/zsh-completions.git
+# Mutt
+[submodule "mutt-colors-solarized"]
+ path = files/.mutt/mutt-colors-solarized
+ url = https://github.com/altercation/mutt-colors-solarized
# Vim bundles
[submodule "vim-pathogen"]
path = files/.vim/bundle/vim-pathogen
@@ -53,6 +57,12 @@
[submodule "taglist.vim"]
path = files/.vim/bundle/taglist.vim
url = https://github.com/vim-scripts/taglist.vim
+[submodule "vim-ledger"]
+ path = files/.vim/bundle/vim-ledger
+ url = https://github.com/ledger/vim-ledger
+[submodule "tabular"]
+ path = files/.vim/bundle/tabular
+ url = https://github.com/godlygeek/tabular
[submodule "syntastic"]
path = files/.vim/bundle/syntastic
url = https://github.com/scrooloose/syntastic.git
@@ -62,6 +72,3 @@
[submodule "L9"]
path = files/.vim/bundle/L9
url = https://github.com/vim-scripts/L9.git
-[submodule "tabular"]
- path = files/.vim/bundle/tabular
- url = https://github.com/godlygeek/tabular.git
diff --git a/files/.mutt/colors b/files/.mutt/colors
index 227119d..b095827 100644
--- a/files/.mutt/colors
+++ b/files/.mutt/colors
@@ -1,33 +1,35 @@
+source ~/.mutt/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc
+
+###
+## Colors
##
-# Colors
-#
-color hdrdefault black cyan
-color quoted brightred black
-color signature magenta black
-color indicator brightwhite red
-color attachment black green
-color error red black
-color message white black
-color search brightwhite magenta
-color status brightyellow magenta
-color tree red black
-color normal white black
-color tilde green black
-color bold brightyellow black
-color markers red black
+#color hdrdefault black cyan
+#color quoted brightred black
+#color signature magenta black
+#color indicator brightwhite red
+#color attachment black green
+#color error red black
+#color message white black
+#color search brightwhite magenta
+#color status brightyellow magenta
+#color tree red black
+#color normal white black
+#color tilde green black
+#color bold brightyellow black
+#color markers red black
-# Highlights inside body of msg.
-color body brightblue black "(http|ftp)://[^ \"\t\r\n]*"
-color body brightblue black "mailto:[-a-z_0-9.]+@[-a-z0-9.]+"
-color body brightblue black "[-a-z_0-9.]+@[-a-z0-9_.]+"
-color body brightgreen black " [:;]-*[)>(<|]"
+## Highlights inside body of msg.
+#color body brightblue black "(http|ftp)://[^ \"\t\r\n]*"
+#color body brightblue black "mailto:[-a-z_0-9.]+@[-a-z0-9.]+"
+#color body brightblue black "[-a-z_0-9.]+@[-a-z0-9_.]+"
+#color body brightgreen black " [:;]-*[)>(<|]"
-color header brightwhite cyan "^(From|Subject):"
+#color header brightwhite cyan "^(From|Subject):"
-color index green black ~p
-color index black yellow ~F
+#color index green black ~p
+#color index black yellow ~F
-color sidebar_new yellow default
+#color sidebar_new yellow default
# vim: ft=muttrc
diff --git a/files/.mutt/folder-hooks.default b/files/.mutt/folder-hooks.default
index 2ea8819..6bb0591 100644
--- a/files/.mutt/folder-hooks.default
+++ b/files/.mutt/folder-hooks.default
@@ -1,4 +1,4 @@
-set index_format="[%Z] %D %-20.20F %s"
+set index_format="[%Z] %[%d %b] %-20.20F %s"
push <collapse-all>
#push '.i' # see macros for more detail
diff --git a/files/.mutt/mutt-colors-solarized b/files/.mutt/mutt-colors-solarized
new file mode 160000
+Subproject 3b23c55eb43849975656dd89e3f35dacd2b93e6
diff --git a/files/.vim/bundle/vim-ledger b/files/.vim/bundle/vim-ledger
new file mode 160000
+Subproject 38d7a037a6959f3dd4efa70d5a780f46328efb6
diff --git a/files/.vim/ftplugin/ledger.vim b/files/.vim/ftplugin/ledger.vim
new file mode 100644
index 0000000..33e292a
--- /dev/null
+++ b/files/.vim/ftplugin/ledger.vim
@@ -0,0 +1,2 @@
+AddTabularPattern! ledger /\v\s{2,}\zs.? ?-?\d+(\.\d+)?( \w+)?$/l0r0
+nmap <Leader>= :%Tabularize ledger<CR>
diff --git a/files/.vim/snippets/ledger.snippets b/files/.vim/snippets/ledger.snippets
new file mode 100644
index 0000000..12abdca
--- /dev/null
+++ b/files/.vim/snippets/ledger.snippets
@@ -0,0 +1,4 @@
+snippet ent
+ `system("date +%Y-%m-%d")` ${1:transaction}
+ ${2:account} ${3:vaule} R
+ ${4}
diff --git a/files/.vimrc b/files/.vimrc
index 5386c48..c9ad23b 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -210,3 +210,7 @@ let s:local_vimrc=$MYVIMRC . ".local"
if filereadable(s:local_vimrc)
silent! execute ':source ' . s:local_vimrc
endif
+
+" Remap sparkup "next tag"
+"let g:sparkupNextMapping = '<c-x>'
+
diff --git a/files/.zsh/rc/S50_aliases b/files/.zsh/rc/S50_aliases
index 12b873c..e92ad52 100644
--- a/files/.zsh/rc/S50_aliases
+++ b/files/.zsh/rc/S50_aliases
@@ -1,7 +1,5 @@
alias -s html=$BROWSER
-alias -s pdf=epdfview
-alias -s ps=epdfview
-alias -s dvi=epdfview
+alias -s pdf=mupdf
alias -s exe=wine
@@ -38,4 +36,6 @@ alias cclip='xclip -selection clipboard'
check_com g || alias g='git'
check_com s || alias s='ssh'
+alias mocp='padsp mocp'
+
# vim: et ft=zsh :
diff --git a/files/.zsh/rc/S51_ledger b/files/.zsh/rc/S51_ledger
new file mode 100644
index 0000000..25aa902
--- /dev/null
+++ b/files/.zsh/rc/S51_ledger
@@ -0,0 +1,14 @@
+# Ledger
+
+alias ledger='noglob ledger'
+
+bal() {
+ ledger balance $* ^Assets ^Liabilities
+}
+
+ele() {
+ fn=$(sed -En 's/^--file (.*)/\1/p' ~/.ledgerrc)
+ vim "$(eval "echo $fn")"
+}
+
+# vim: et ft=zsh :
diff --git a/files/bin b/files/bin
-Subproject 7d3e90a48b065e9ab15e8ea5610b67751913374
+Subproject f43355c65406710bfdfcdfe40f188eb13c9bf2a