From c3ccee84e5c89635ad1ee02739e75d6614faa579 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 3 Mar 2016 21:00:21 -0800
Subject: [PATCH] Updates

---
 .vim/keymaps.vim | 18 ++++++++++--------
 .vim/plugins.vim |  1 -
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.vim/keymaps.vim b/.vim/keymaps.vim
index 0617583..75dadb8 100644
--- a/.vim/keymaps.vim
+++ b/.vim/keymaps.vim
@@ -1,15 +1,17 @@
 let mapleader = ','
 
 " core
-nnoremap <silent> <Bs> :bd<Cr>
+nnoremap <Bs> :bd!<Cr>
+nnoremap <kMinus> <C-W>-
+nnoremap <kPlus> <C-W>+
+nnoremap <leader><leader> :b#<Cr>
+nnoremap <leader>w :w<Cr>
 nnoremap <silent> <Esc><Esc> :nohlsearch<Cr>
 nnoremap <silent> <leader>n :set relativenumber!<Cr>
-nnoremap <silent> Q <Nop>
-nnoremap <silent> j gj
-nnoremap <silent> k gk
-nnoremap <silent> <kPlus> <C-W>+
-nnoremap <silent> <kMinus> <C-W>-
-inoremap <silent> <C-c> <Esc>
+nnoremap Q <Nop>
+nnoremap j gj
+nnoremap k gk
+noremap <C-c> <Esc>
 
 " vim-argwrap
 nnoremap <silent> <leader>a :ArgWrap<Cr>
@@ -18,8 +20,8 @@ nnoremap <silent> <leader>a :ArgWrap<Cr>
 nnoremap <silent> <S-Bs> :BufOnly<Cr>
 
 " vim-easy-align
-vmap <Cr> <Plug>(EasyAlign)
 nmap ga <Plug>(EasyAlign)
+vmap <Cr> <Plug>(EasyAlign)
 
 " vim-go
 auto FileType go nmap <leader>b <Plug>(go-build)
diff --git a/.vim/plugins.vim b/.vim/plugins.vim
index 3aae060..1fa2f83 100644
--- a/.vim/plugins.vim
+++ b/.vim/plugins.vim
@@ -2,7 +2,6 @@ call plug#begin('~/.vim/plugged')
 
 Plug 'https://github.com/Chun-Yang/vim-action-ag.git'
 Plug 'https://github.com/FooSoft/vim-argwrap.git'
-Plug 'https://github.com/Lokaltog/vim-easymotion.git'
 Plug 'https://github.com/airblade/vim-gitgutter.git'
 Plug 'https://github.com/antoyo/vim-licenses.git'
 Plug 'https://github.com/b4winckler/vim-angry.git'