Updates.

4 files changed, 26 insertions, 25 deletions

diff --git a/files/.gitconfig b/files/.gitconfig
index f740f38..013bf39 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -45,6 +45,7 @@
     quickserve="daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/"
 [advice]
     statusHints = false
+    detachedHead = false
 [branch]
     autosetupmerge = always
     autosetuprebase = local
diff --git a/files/.vimrc b/files/.vimrc
index 5e63f7d..64d1d53 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -465,21 +465,6 @@ augroup ft_json
 augroup END
 
 " }}}
-" Ledger {{{
-augroup ft_ledger
-    au!
-    au FileType ledger inoremap <silent><buffer> <Leader>e <Esc>:call ledger#entry()<CR>
-    au FileType ledger noremap = :LedgerAlign<CR>
-    au FileType ledger iabbrev <buffer> alfa Assets:Bank:AlfaBank:Card
-    au FileType ledger iabbrev <buffer> tinkof Assets:Bank:Tinkoff:Card-Black
-    au FileType ledger iabbrev <buffer> coin Assets:Bank:HomeCredit:Card:CoinKeeper
-    au BufWritePost *.ledger silent! make | redraw! | cwindow
-    au FileType ledger setlocal foldmethod=marker foldmarker={,}
-    au FileType ledger noremap <Leader>e :call ledger#entry()<CR>
-    au FileType leader let g:crunch_result_type_append = 0
-    au FileType ledger compiler ledger
-augroup END
-" }}}
 " Org {{{
 augroup ft_org
     au!
@@ -591,7 +576,24 @@ let g:ctrlp_user_caching = 0
 " }}}
 " Ledger {{{
 
+augroup ft_ledger
+    au!
+    au FileType ledger inoremap <silent><buffer> <Leader>e <Esc>:call ledger#entry()<CR>
+    au FileType ledger noremap = :LedgerAlign<CR>
+    au FileType ledger iabbrev <buffer> alfa Assets:Bank:AlfaBank:Card
+    au FileType ledger iabbrev <buffer> tinkof Assets:Bank:Tinkoff:Card-Black
+    au FileType ledger iabbrev <buffer> coin Assets:Bank:HomeCredit:Card:CoinKeeper
+    au BufWritePost *.ledger silent! make | redraw! | cwindow
+    au FileType ledger setlocal foldmethod=marker foldmarker={,}
+    au FileType ledger noremap <Leader>e :call ledger#entry()<CR>
+    au FileType leader let g:crunch_result_type_append = 0
+    au FileType ledger compiler ledger
+augroup END
+
+let g:ledger_date_format = '%Y-%m-%d'
 let g:ledger_align_at = 80
+let g:ledger_descriptions_cmd = 'cat ~/.ledger-descriptions'
+let g:ledger_accounts_cmd = 'cat ~/.ledger-accounts'
 
 " }}}
 " vimtex {{{
diff --git a/files/.zsh/rc/S50_aliases b/files/.zsh/rc/S50_aliases
index a3f5a25..9b94368 100644
--- a/files/.zsh/rc/S50_aliases
+++ b/files/.zsh/rc/S50_aliases
@@ -19,14 +19,18 @@ alias du='du -h'
 alias free='free -tm'
 alias whois='whois -H'
 alias zgrep='zgrep --color=auto'
+alias fn='find . -name'
 
-alias ls='ls --color=auto -h -F'
+alias ls='ls --color=auto -h -F --group-directories-first'
+alias d='dirs -v | head -10'
 
 alias rm='rm --interactive=once'
 alias mv='mv --interactive'
+alias cp='cp --recursive'
 
+alias c=' clear'
 alias v='vim'
-alias t='tmux'
+alias t='tmux new-session -A -s main'
 alias ta='tmux attach-session'
 alias mux='tmuxinator'
 
@@ -83,15 +87,9 @@ alias tlp-stat='sudo tlp-stat'
 alias tlp-fullcharge='sudo tlp fullcharge BAT0; sudo tlp fullcharge BAT1'
 alias tlp-setcharge='sudo tlp setcharge BAT0; sudo tlp setcharge BAT1'
 
-# VPN
-
-alias vpnopen='sudo vpnc-connect'
-alias vpnclose='sudo vpnc-disconnect'
-
 # Global
 
-alias -g G='|grep'
-alias -g GI='|grep -i'
+alias -g G='|grep -i'
 alias -g H='|head'
 alias -g T='|tail'
 alias -g L='|less'
diff --git a/files/.zsh/rc/S90_z b/files/.zsh/rc/S90_z
index c78f3cb..2b7f87a 100644
--- a/files/.zsh/rc/S90_z
+++ b/files/.zsh/rc/S90_z
@@ -148,7 +148,7 @@ _z() {
             function output(matches, best_match, common) {
                 # list or return the desired directory
                 if( list ) {
-                    cmd = "sort -n >&2"
+                    cmd = "sort -g >&2"
                     for( x in matches ) {
                         if( matches[x] ) {
                             printf "%-10s %s\n", matches[x], x | cmd