Update config

4 files changed, 44 insertions, 8 deletions

diff --git a/files/.gitconfig b/files/.gitconfig
index b063960..5481ae4 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -22,7 +22,7 @@
 [alias]
     aa = add --all --intent-to-add
     ar = !sh -c 'git archive --format=tar --prefix="$(basename "$PWD")-$1/" $1^{tree} | bzip2 >"$(basename "$PWD")-$1.tar.bz2"' -
-    br = branch
+    br = branch --sort=-committerdate
     c = commit --verbose
     co = checkout
     ci = commit
@@ -61,3 +61,13 @@
     ;clean = unexpand --tabs=4 --first-only
 [gui]
     tabsize = 2
+[pull]
+    rebase = true
+[guitool "meld"]
+    cmd = meld $FILENAME
+    noconsole = yes
+    needsfile = yes
+[guitool "gvim"]
+    cmd = gvim $FILENAME
+    noconsole = yes
+    needsfile = yes
diff --git a/files/.vim/templates/=template=.tex b/files/.vim/templates/=template=.tex
new file mode 100644
index 0000000..3afb4af
--- /dev/null
+++ b/files/.vim/templates/=template=.tex
@@ -0,0 +1,26 @@
+\documentclass[a4paper,12pt]{scrartcl}
+
+\usepackage[utf8]{inputenc}
+\usepackage[T2A]{fontenc}
+\usepackage[russian,english]{babel}
+\usepackage{hyperref}
+%\usepackage[margin=1in]{geometry}
+\usepackage{microtype}
+\usepackage{titling}
+
+\title{%FILE%}
+\author{Anton Bobov <anton@bobov.name>}
+\date{\today}
+
+\hypersetup{
+    pdftitle={\thetitle},
+    pdfauthor={\theauthor},
+    pdfkeywords={\thedate}
+}
+
+\begin{document}
+\maketitle
+
+
+
+\end{document}
diff --git a/files/.vimrc b/files/.vimrc
index fe018f6..db31112 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -48,7 +48,7 @@ Plugin 'https://github.com/scrooloose/nerdcommenter.git'
 " Automatic closing of quotes, parenthesis, etc...
 Plugin 'https://github.com/raimondi/delimitmate'
 " Syntax check and linting
-Plugin 'https://github.com/scrooloose/syntastic.git'
+"Plugin 'https://github.com/scrooloose/syntastic.git'
 " Text alignment commands
 Plugin 'https://github.com/godlygeek/tabular'
 " Pasting in vim
@@ -221,7 +221,7 @@ if has('termguicolors')
     set termguicolors
 endif
 set background=light
-colorscheme solarized8_light
+colorscheme solarized8
 
 " }}}
 
@@ -450,6 +450,10 @@ 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> polza Assets:Bank:HomeCredit:Card:Polza
+    au FileType ledger iabbrev <buffer> alfa Assets:Bank:AlfaBank:Card
+    au FileType ledger iabbrev <buffer> tinkof Assets:Bank:Tinkoff:Card-Black
+    au BufWritePost *.ledger silent! make | redraw! | cwindow
 augroup END
 " }}}
 " Org {{{
diff --git a/files/.zsh/rc/S50_aliases b/files/.zsh/rc/S50_aliases
index 60643b0..656fe32 100644
--- a/files/.zsh/rc/S50_aliases
+++ b/files/.zsh/rc/S50_aliases
@@ -29,11 +29,6 @@ alias v='vim'
 alias t='tmux'
 alias mux='tmuxinator'
 
-if $(which grc >/dev/null 2>&1) ; then
-    alias ping='grc ping'
-    alias dig='grc dig'
-    alias ip='grc ip'
-fi
 
 alias display_off='xset dpms force off'
 
@@ -124,5 +119,6 @@ elif $(which libreoffice >/dev/null) ; then
     alias 2pdf='libreoffice --headless --convert-to pdf'
 fi
 
+#[[ -s /etc/grc.zsh ]] && source /etc/grc.zsh
 
 # vim: et ft=zsh :