From 8a49064c95643b022deaf4a0325e0170837b796a Mon Sep 17 00:00:00 2001
From: Artem Sheremet <dot.doom@gmail.com>
Date: Mon, 20 Oct 2014 16:49:52 +0300
Subject: [PATCH] Migrate to some new software

---
 .ackrc | 13 -------------
 .rc    |  1 +
 .vimrc | 36 ++++++++++++++++--------------------
 3 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 .ackrc

diff --git a/.ackrc b/.ackrc
deleted file mode 100644
index 6f19865..0000000
--- a/.ackrc
+++ /dev/null
@@ -1,13 +0,0 @@
---type-set
-skipjack=.tdf,.vm
---type-set
-diff=.diff
---type-set
-erb=.erb
---pager=$PAGER
---context=1
---smart-case
---ignore-dir=ext
---ignore-dir=cherryonnext
---ignore-dir=CherryOnExt
---ignore-dir=build
diff --git a/.rc b/.rc
index 6852eea..8cb6219 100644
--- a/.rc
+++ b/.rc
@@ -67,6 +67,7 @@ alias dbgrep='dbgrep.pl -vpuroot'
 alias tcpdump='tcpdump -l'
 alias pacman='pacman --color auto'
 alias xo=xdg-open
+alias ag='ag -C 2 --pager=$PAGER --smart-case'
 
 function i4() {
 	if [ $# -eq 0 ]; then
diff --git a/.vimrc b/.vimrc
index 8b12993..42e381c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -125,17 +125,11 @@ call vundle#rc()
 
 Bundle 'gmarik/vundle'
 
-Bundle 'mileszs/ack.vim'
-
+Bundle 'rking/ag.vim'
 Bundle 'kien/ctrlp.vim'
-
-Bundle 'vim-scripts/mru.vim'
+Bundle 'mhinz/vim-startify'
 Bundle 'scrooloose/nerdcommenter'
 Bundle 'scrooloose/nerdtree'
-
-Bundle 'ervandew/supertab'
-let g:SuperTabDefaultCompletionType = "context"
-
 Bundle 'tpope/vim-fugitive'
 Bundle 'jacquesbh/vim-showmarks'
 Bundle 'kchmck/vim-coffee-script'
@@ -143,6 +137,9 @@ Bundle 'vim-scripts/nginx.vim'
 Bundle 'airblade/vim-gitgutter'
 Bundle 'terryma/vim-multiple-cursors'
 
+Bundle 'ervandew/supertab'
+let g:SuperTabDefaultCompletionType = "context"
+
 Bundle 'majutsushi/tagbar'
 let g:tagbar_type_go = {
 	\ 'ctagstype' : 'go',
@@ -215,19 +212,18 @@ fu! Amap(key, cmd, ...)
 	exe "imap <" . a:key . "> <c-o><" . a:key . ">"
 endf
 
-call Amap("C-t", "CtrlP")
-call Amap("C-n", "tabnew")
+call Amap("C-t", "tabnew")
 call Amap("C-b", ":ls<CR>:b<Space>", 0)
+call Amap("C-w", "close")
 
 call Amap("F2", "update")
 call Amap("F3", "NERDTreeToggle")
-call Amap("F4", "close")
 call Amap("F5", "!ruby -c %")
 call Amap("F6", "make -s clean all")
 call Amap("F7", "TagbarToggle")
 "setl noai nocin nosi inde= formatoptions-=c formatoptions-=r formatoptions-=o nonumber
 call Amap("F8", "setl paste! number! list! <bar> NoShowMarks <bar> GitGutterToggle")
-call Amap("F9", "!traider")
+call Amap("F9", " :!traider ", 0)
 
 " Navigate by tabs with Shift+Left/Right
 call Amap("S-Left", "tabprev")
@@ -238,10 +234,10 @@ call Amap("S-Right", "tabnext")
 "nmap gf <Plug>RailsTabFind
 
 " Navigate by windows with Ctrl+direction
-call Amap("C-Left", "<C-W>h", 0)
-call Amap("C-Down", "<C-W>j", 0)
-call Amap("C-Up", "<C-W>k", 0)
-call Amap("C-Right", "<C-W>l", 0)
+call Amap("C-Left", "wincmd h")
+call Amap("C-Down", "wincmd j")
+call Amap("C-Up", "wincmd k")
+call Amap("C-Right", "wincmd l")
 
 " Resize windows with Alt+direction
 call Amap("M-Left", "vertical resize -1")
@@ -250,10 +246,10 @@ call Amap("M-Up", "resize -1")
 call Amap("M-Right", "vertical resize +1")
 
 " Move windows with Ctrl+Shift+direction
-call Amap("C-S-Left", "<C-W>H", 0)
-call Amap("C-S-Down", "<C-W>J", 0)
-call Amap("C-S-Up", "<C-W>K", 0)
-call Amap("C-S-Right", "<C-W>L", 0)
+call Amap("C-S-Left", "wincmd H")
+call Amap("C-S-Down", "wincmd J")
+call Amap("C-S-Up", "wincmd K")
+call Amap("C-S-Right", "wincmd L")
 
 " Split windows with Ctrl+Alt+Down/Right
 call Amap("C-M-Down", "split")