Updates.

5 files changed, 9 insertions, 2 deletions

diff --git a/files/.gitconfig b/files/.gitconfig
index a883cda..462e97c 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -51,6 +51,8 @@
     wc = whatchanged -p --abbrev-commit --pretty=medium
     undo = reset --soft HEAD~
     whoami = config user.email
+    fugitive = mergetool --tool fugitive
+    clean-branches = !sh -c 'git branch --merged | grep -v '^*' | fzf -m | xargs -rp git branch -d'
 [advice]
     statusHints = false
     detachedHead = false
@@ -93,3 +95,5 @@
     clean = git-lfs clean -- %f
     smudge = git-lfs smudge -- %f
     process = git-lfs filter-process
+[mergetool "fugitive"]
+    cmd = vim -c \"Gdiff\" \"$MERGED\"
diff --git a/files/.tmux.conf b/files/.tmux.conf
index ee9533a..32efa71 100644
--- a/files/.tmux.conf
+++ b/files/.tmux.conf
@@ -33,7 +33,7 @@ setw -g mouse on
 #bind \ split-window -h -c '#{pane_current_path}'
 
 # toggle last 2 windows
-bind C-a last-window
+bind-key Tab last-window
 
 ## pane movement
 #bind h select-pane -L
diff --git a/files/.tmux/plugins/tpm b/files/.tmux/plugins/tpm
-Subproject 26d9ace1b47f4591b2afdf333442a498311b6ac
+Subproject 59f78857f656afd462d7bc99b31cc8cc36c1872
diff --git a/files/.vimrc b/files/.vimrc
index 28887e6..0449fa7 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -105,8 +105,9 @@ endif
 set keymap=russian-jcukenwin
 set spelllang=ru,en
 set spell
+set spellcapcheck=
 set iminsert=0
-set imsearch=0
+"set imsearch=0
 
 " }}}
 
@@ -169,6 +170,7 @@ set cursorline
 set ttyfast
 set mouse=a
 set shortmess+=Ic
+set nrformats-=octal
 
 set autoindent
 set smartindent
@@ -591,6 +593,7 @@ let g:ctrlp_user_caching = 0
 augroup ft_ledger
     au!
     au FileType ledger inoremap <silent><buffer> <Leader>e <Esc>:call ledger#entry()<CR>
+    au FileType ledger noremap <silent><buffer> <Leader>x <Esc>:call ledger#transaction_state_toggle(line('.'), '* ')<CR>
     au FileType ledger noremap = :LedgerAlign<CR>
     au FileType ledger iabbrev <buffer> alfa Assets:Bank:AlfaBank:Card
     au FileType ledger iabbrev <buffer> soyuz Assets:Bank:Soyuz:Savings:Deposit:2019-04-15
diff --git a/files/bin b/files/bin
-Subproject 279750251f0d6e864d3d80855b7fd3164387e3c
+Subproject d449097301953bbd626433814cab5aa0680e3ac