From 4657a2687396612e3923d06427a1e042529bdb13 Mon Sep 17 00:00:00 2001
From: Konstantin Bukley <kostya.b@matic.com>
Date: Tue, 5 Mar 2019 15:41:18 +0200
Subject: [PATCH] vim: update

---
 bash/.bashrc |  1 +
 vim/.vimrc   | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index c183c0a..6130994 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -55,6 +55,7 @@ alias gpf='git push -f'
 alias gb='git branch'
 alias gl='git lg'
 alias gr='git reset'
+alias gh='git lg -1'
 
 alias rdc='be rake db:create'
 alias rdd='be rake db:drop'
diff --git a/vim/.vimrc b/vim/.vimrc
index 3ede0c0..a2f1fe3 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -39,7 +39,6 @@ call plug#begin('~/.vim/plugged')
 " ======== Languages / Textobjects =======================
 
 Plug 'sheerun/vim-polyglot'
-Plug 'jtratner/vim-flavored-markdown'
 Plug 'kana/vim-textobj-user'
 Plug 'nelstrom/vim-textobj-rubyblock'
 Plug 'austintaylor/vim-indentobject'
@@ -94,8 +93,6 @@ Plug 'tpope/vim-vinegar'
 " ======== Experimental =================================
 
 Plug 'w0rp/ale'
-" Plug 'junegunn/goyo.vim'
-" Plug 'junegunn/limelight.vim'
 
 call plug#end()
 
@@ -482,7 +479,7 @@ if has("autocmd")
   au BufNewFile,BufRead *.rabl,*.jbuilder           setl ft=ruby
 
   au BufNewFile,BufRead *.phtml         setl ft=html
-  au BufNewFile,BufRead *.md,*.markdown setl ft=ghmarkdown
+  " au BufNewFile,BufRead *.md,*.markdown setl ft=ghmarkdown
 
   " Hide statusline
   autocmd! FileType fzf
@@ -499,6 +496,9 @@ if has("autocmd")
   " Close tab if only NERDTree left
   au WinEnter * call CloseNERDTree()
 
+  " Equalize window sizes when Vim is resized
+  au VimResized * tabdo wincmd =
+
   " Apply solarized tweak
   au ColorScheme solarized call TweakSolarized()
 
@@ -581,6 +581,8 @@ set mat=2
 set gcr=a:blinkon0
 " hide the mouse pointer while typing
 set mousehide
+" conceal mostly for markdown
+set conceallevel=2
 
 
 
@@ -756,7 +758,7 @@ nnoremap Y y$
 
 " vv/ss for splits
 nnoremap <silent>vv <c-w>v
-nnoremap <silent>ss <c-w>s
+" nnoremap <silent>ss <c-w>s
 
 " Highlight VCS conflict markers
 match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
@@ -777,6 +779,9 @@ nnoremap L $
 " Avoid entering Ex mode by pressing gQ
 nnoremap gQ <nop>
 
+" Scratchpad
+nnoremap <BS> :tabnew ~/iCloud/scratchpad.md<CR>
+
 " I don't use it
 nnoremap K <nop>