8 files changed, 32 insertions, 27 deletions
diff --git a/files/.gitconfig b/files/.gitconfig
index 4b7bd99..ff2a84f 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -1,6 +1,6 @@
 [user]
     name = Anton Bobov
-    email = abobov@gmail.com
+    email = anton@bobov.name
 [http]
     sslVerify = false
 [color "diff-highlight"]
diff --git a/files/.vim/after/ftplugin/mail.vim b/files/.vim/after/ftplugin/mail.vim
index ff7b8a7..881ffbb 100644
--- a/files/.vim/after/ftplugin/mail.vim
+++ b/files/.vim/after/ftplugin/mail.vim
@@ -5,4 +5,4 @@ set imsearch=1
 set iminsert=1
 nohlsearch
 set colorcolumn=+1
-set formatoptions+=aw
+"set formatoptions+=aw
diff --git a/files/.vimrc b/files/.vimrc
index 3253467..f94ebcf 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -13,52 +13,52 @@ call vundle#begin()
 Plugin 'VundleVim/Vundle.vim'
 
 " Library for other plugins
-Plugin 'https://github.com/vim-scripts/L9.git'
+Plugin 'vim-scripts/L9.git'
 
 " Git inside vim
-Plugin 'https://github.com/tpope/vim-fugitive.git'
-Plugin 'https://github.com/airblade/vim-gitgutter'
-Plugin 'https://github.com/tpope/vim-unimpaired'
+Plugin 'tpope/vim-fugitive.git'
+Plugin 'airblade/vim-gitgutter'
+Plugin 'tpope/vim-unimpaired'
 
 " Intelligent date inc/dec
-Plugin 'https://github.com/tpope/vim-speeddating'
+Plugin 'tpope/vim-speeddating'
 " Readline style insertion
 Plugin 'tpope/vim-rsi'
 " Show colors in CSS format
-Plugin 'https://github.com/ap/vim-css-color'
+Plugin 'ap/vim-css-color'
 " Load project .vimrc files
 "Plugin 'https://github.com/MarcWeber/vim-addon-local-vimrc'
 " Fuzzy finder
-Plugin 'https://github.com/ctrlpvim/ctrlp.vim'
+Plugin 'ctrlpvim/ctrlp.vim'
 " Finder
-Plugin 'https://github.com/vim-scripts/FuzzyFinder.git'
+Plugin 'vim-scripts/FuzzyFinder.git'
 " Solarized colorscheme
-Plugin 'https://github.com/lifepillar/vim-solarized8'
+Plugin 'lifepillar/vim-solarized8'
 " Zen codding
-Plugin 'https://github.com/mattn/emmet-vim.git'
+Plugin 'mattn/emmet-vim.git'
 " Code snippets
 Plugin 'SirVer/ultisnips'
 " Silversearch plugin
 Plugin 'mileszs/ack.vim'
 " Support dot command for plugins
-Plugin 'https://github.com/tpope/vim-repeat.git'
-Plugin 'https://github.com/tpope/vim-surround.git'
+Plugin 'tpope/vim-repeat.git'
+Plugin 'tpope/vim-surround.git'
 " Files tree plugin
-Plugin 'https://github.com/scrooloose/nerdtree'
+Plugin 'scrooloose/nerdtree'
 " Commenting text
-Plugin 'https://github.com/scrooloose/nerdcommenter.git'
+Plugin 'scrooloose/nerdcommenter.git'
 " Automatic closing of quotes, parenthesis, etc...
-Plugin 'https://github.com/raimondi/delimitmate'
+Plugin 'raimondi/delimitmate'
 " Syntax check and linting
 "Plugin 'https://github.com/scrooloose/syntastic.git'
 " Text alignment commands
-Plugin 'https://github.com/godlygeek/tabular'
+Plugin 'godlygeek/tabular'
 " Pasting in vim
-Plugin 'https://github.com/ConradIrwin/vim-bracketed-paste'
+Plugin 'ConradIrwin/vim-bracketed-paste'
 " File templates
-Plugin 'https://github.com/aperezdc/vim-template'
+Plugin 'aperezdc/vim-template'
 " Calculations in Vim
-Plugin 'https://github.com/arecarn/vim-crunch'
+Plugin 'arecarn/vim-crunch'
 " Vim Tmux Navigator
 Plugin 'christoomey/vim-tmux-navigator'
 Plugin 'lervag/vimtex'
diff --git a/files/.zsh/rc/S50_aliases b/files/.zsh/rc/S50_aliases
index 8a9d416..1688550 100644
--- a/files/.zsh/rc/S50_aliases
+++ b/files/.zsh/rc/S50_aliases
@@ -56,6 +56,7 @@ fi
 alias fd='fdfind'
 alias dd='dd status=progress'
 alias ls='ls --color=auto -h -F --group-directories-first'
+alias l='ls -l'
 alias d='dirs -v | head -10'
 
 alias da='\du -sch'
@@ -75,7 +76,7 @@ alias t='tmux new-session -A -s main'
 alias mux='tmuxinator'
 alias scratch='vim -c Scratch'
 alias scratchmd='vim -c Scratch -c "set ft=markdown"'
-alias rscp='rsync -avzhP'
+alias rscp='rsync -rlptDvzhP'
 is_command pigz && alias gzip='pigz'
 is_command unpigz && alias gunzip='unpigz'
 
@@ -121,7 +122,7 @@ alias nicer='nice -n 15 ionice -c 2 -n 7'
 alias gco="git branch --sort=-committerdate | fzf --tiebreak=index | xargs git checkout"
 alias gst="git status"
 alias ghome='cd "$(git rev-parse --show-toplevel)"'
-test -f ~/bin/pandoc-filter-includes.py && alias pdoc='pandoc --smart --standalone --filter ~/bin/pandoc-filter-includes.py'
+test -f ~/bin/pandoc-filter-includes.py && alias pdoc='pandoc --standalone --filter ~/bin/pandoc-filter-includes.py'
 is_command pgcli && alias pgcli="pgcli --pgclirc ~/.config/pgcli/config --pgclirc ~/.config/pgcli/local.config"
 
 function mvn-or-mvnw() {
@@ -134,6 +135,7 @@ function mvn-or-mvnw() {
 }
 alias mvn="mvn-or-mvnw"
 compdef _mvn mvn-or-mvnw
+compdef _mvn mvnd
 
 # Docker and docker-compose
 alias dbash='docker exec -it `docker ps -ql` bash'
@@ -146,6 +148,9 @@ alias dc-logs='dc logs --tail 100 --follow'
 function dc-stats() {
     dc $@ ps -q | xargs --no-run-if-empty docker stats
 }
+function docker-save() {
+    docker save "$1" | gzip > $(slugify "$1").tar.gz
+}
 alias docker-top='docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock moncho/dry'
 alias docker-dive='docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock wagoodman/dive'
 
@@ -186,7 +191,7 @@ if is_command unoconv; then
 elif is_command libreoffice; then
     alias 2pdf='libreoffice --headless --convert-to pdf'
 fi
-alias pdoc-pdf='pandoc --latex-engine=xelatex -V geometry:margin=1in -V mainfont="Linux Libertine O"'
+alias pdoc-pdf='pandoc -V fontenc=T2A -V geometry:margin=1in -V mainfont="Linux Libertine O"'
 alias ocrmypdf='ocrmypdf --clean --deskew --rotate-pages'
 alias ocrmypdf-rus='ocrmypdf --language rus'
 alias ocrmypdf-eng='ocrmypdf --language eng'
diff --git a/files/.zsh/rc/S50_functions b/files/.zsh/rc/S50_functions
index eb183be..9ce889b 100644
--- a/files/.zsh/rc/S50_functions
+++ b/files/.zsh/rc/S50_functions
@@ -40,7 +40,7 @@ open() {
 
 retry() {
     for i in $(seq 5) ; do
-        $* && break || sleep 5
+        "$@" && break || sleep 5
     done
 }
 
diff --git a/files/.zsh/rc/S51_ledger b/files/.zsh/rc/S51_ledger
index 8740680..5fbb13f 100644
--- a/files/.zsh/rc/S51_ledger
+++ b/files/.zsh/rc/S51_ledger
@@ -29,7 +29,7 @@ bal() {
 
 lx() {
     entry=$(ledger xact $*)
-    fn="$HOME/Dropbox/ledger/data/$(date +%Y).ledger"
+    fn="$HOME/Dropbox/ledger/data/current.ledger"
 
     echo "$entry"
     read -q reply?"Is it ok? (Y/n) "
diff --git a/files/.zsh/rc/S90_z b/files/.zsh/rc/S90_z
index 3245b1c..7e9a470 100644
--- a/files/.zsh/rc/S90_z
+++ b/files/.zsh/rc/S90_z
@@ -1,5 +1,5 @@
 # vim: ft=zsh :
-source $ZSHDIR/z/z.sh
+source $HOME/.zsh/z/z.sh
 
 unalias z 2>/dev/null
 z() {
diff --git a/files/bin b/files/bin
-Subproject c83690911af9326784d81e49e2b55de9688c1e9
+Subproject b25a5b794be7093dbcd556fcab2ebc50bb33e8b