diff options
| -rw-r--r-- | files/.gitconfig | 8 | ||||
| -rw-r--r-- | files/.mpv/mpv.conf | 2 | ||||
| -rw-r--r-- | files/.vimrc | 15 | ||||
| -rw-r--r-- | files/.zsh/rc/S51_ledger | 8 |
4 files changed, 25 insertions, 8 deletions
diff --git a/files/.gitconfig b/files/.gitconfig index 88b0878..fca7a34 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -37,9 +37,12 @@ f = !sh -c 'git branch | grep -F "feature/$1" | xargs -r -n 1 git co' - st = status stashlist = stash list --date=short + sha = rev-parse --short addnw = !sh -c 'git diff --unified=0 --ignore-all-space --no-color "$@" | git apply --cached --ignore-whitespace --unidiff-zero -' branch-name = "!git rev-parse --abbrev-ref HEAD" publish = "!git push -u origin $(git branch-name)" + # https://datagrok.org/git/git-serve/ + quickserve="daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/" [advice] statusHints = false [branch] @@ -75,3 +78,8 @@ path = .gitconfig.local [includeIf "gitdir:~/src/rusgis/**"] path = ~/.gitconfig-rusgis +[filter "lfs"] + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process diff --git a/files/.mpv/mpv.conf b/files/.mpv/mpv.conf index 7510b8d..a48d033 100644 --- a/files/.mpv/mpv.conf +++ b/files/.mpv/mpv.conf @@ -3,4 +3,4 @@ force-window=immediate save-position-on-quit no-terminal screenshot-template=mpv-shot-%F-%{media-title}-%p-%n -screenshot-directory=mpv-screenshots +screenshot-directory=~/mpv-screenshots diff --git a/files/.vimrc b/files/.vimrc index 9992444..58d878e 100644 --- a/files/.vimrc +++ b/files/.vimrc @@ -55,11 +55,16 @@ Plugin 'https://github.com/godlygeek/tabular' Plugin 'https://github.com/ConradIrwin/vim-bracketed-paste' " File templates Plugin 'https://github.com/aperezdc/vim-template' +" Calculations in Vim +Plugin 'https://github.com/arecarn/vim-crunch' +" Vim Tmux Navigator +Plugin 'christoomey/vim-tmux-navigator' " File types " Ledger -Plugin 'https://github.com/abobov/vim-ledger' +"Plugin 'https://github.com/abobov/vim-ledger' +Plugin 'https://github.com/ledger/vim-ledger' " Jade templates Plugin 'https://github.com/digitaltoad/vim-jade.git' @@ -466,8 +471,12 @@ augroup ft_ledger 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 let g:ledger_align_at = 80 + 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 {{{ @@ -581,7 +590,7 @@ let g:ctrlp_user_caching = 0 " }}} " Ledger {{{ -let g:ledger_commodity_spell = 0 +let g:ledger_align_at = 80 " }}} " }}} diff --git a/files/.zsh/rc/S51_ledger b/files/.zsh/rc/S51_ledger index a80355b..75e2243 100644 --- a/files/.zsh/rc/S51_ledger +++ b/files/.zsh/rc/S51_ledger @@ -7,8 +7,8 @@ alias lweek='noglob ledger register --begin "last 7 days"' alias balc='bal --current --aux-date' alias lpending='ledger register --pending' alias lcash='ledger balance Expenses:Cash' -alias budget='ledger budget --exchange R Expenses' -alias budget-month='ledger budget --period "this month" --exchange R Expenses' +alias budget='ledger budget --exchange R ^Expenses and not ^Expenses:Cash' +alias budget-month='ledger budget --period "this month" --exchange R ^Expenses and not ^Expenses:Cash' _ledger_smartcase_expr() { echo "$1" | sed -r 's/[A-Z]/.*&/g' @@ -18,9 +18,9 @@ bal() { if [ $# -eq 0 ] || [[ $1 =~ [-].+ ]] ; then ledger balance $* ^Assets ^Liabilities elif [ $# -eq 1 ] ; then - ledger balance ^Assets and $(_ledger_smartcase_expr "$*") + ledger balance \( ^Assets ^Liabilities \) and $(_ledger_smartcase_expr "$*") else - ledger balance ^Assets and $* + ledger balance \( ^Assets ^Liabilities \) and $* fi } |