From c601a28564a2557c2c23236ead889c91a06be9fa Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Fri, 6 Mar 2015 03:24:40 +0300
Subject: [PATCH] we mostly deal with new files in python 3, also comment out
 some old themes I barely ever use, I have enough plugins as it is

---
 vimrc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/vimrc b/vimrc
index 66a9275..d02efa5 100644
--- a/vimrc
+++ b/vimrc
@@ -39,15 +39,13 @@ autocmd BufNewFile *.zsh 0put =\"#!/usr/bin/env zsh\<nl>\"|$
 autocmd BufNewFile *.lua 0put =\"#!/usr/bin/env lua\<nl>\"|$
 autocmd BufNewFile *.sh 0put =\"#!/usr/bin/env bash\<nl>\"|$
 autocmd BufNewFile *.rb 0put =\"#!/usr/bin/env ruby\<nl>\"|$
-autocmd BufNewFile *.py 0put =\"#!/usr/bin/env python\<nl>\"|$
+autocmd BufNewFile *.py 0put =\"#!/usr/bin/env python3\<nl>\"|$
 autocmd BufNewFile *.pl 0put =\"#!/usr/bin/env perl\<nl>\use strict;\<nl>\use warnings;\<nl>\use feature 'say';\<nl>\"|$
 
 " maps
 let mapleader = ","
 nmap <Space> <C-W>
 noremap <F1> <Esc>
-"make it easier to exit insert mode
-inoremap jk <Esc>
 "clear search highlight
 nnoremap <Leader>/ :nohls<CR>
 "make wrapped lines navigation easier
@@ -99,6 +97,7 @@ if v:version >= 700
 		Plugin 'tpope/vim-tbone'                "tmux support
 		"Plugin 'xolox/vim-misc'                 "deps for lua-ftplugin
 		"Plugin 'xolox/vim-lua-ftplugin'         "lua stuff
+		"Plugin 'vimacs'
 
 		" from vim.sf.net
 		Plugin 'directionalWindowResizer'       "resize windows with simple hotkeys
@@ -106,10 +105,10 @@ if v:version >= 700
 		" colorscheme ...
 		Plugin 'vdrandom/forked-solarized.vim'  "solarized
 		Plugin 'morhetz/gruvbox'                "gruvbox
-		Plugin 'whatyouhide/vim-gotham'         "gotham
-		Plugin 'vim-scripts/strange'            "strange
-		Plugin 'chriskempson/base16-vim'        "base16 variety
-		Plugin 'tomasr/molokai'                 "molokai
+		"Plugin 'whatyouhide/vim-gotham'         "gotham
+		"Plugin 'vim-scripts/strange'            "strange
+		"Plugin 'chriskempson/base16-vim'        "base16 variety
+		"Plugin 'tomasr/molokai'                 "molokai
 
 		" syntax highlight plugins
 		Plugin 'puppetlabs/puppet-syntax-vim'   "puppet