From 00952c4c1b745385111e1152168067ebc0c9638a Mon Sep 17 00:00:00 2001
From: Emerson <github@emersonveenstra.net>
Date: Wed, 22 Jun 2016 13:58:30 -0400
Subject: [PATCH] Move to tab indenting

---
 .vim/after/ftplugin/html.vim   |  1 -
 .vim/after/ftplugin/php.vim    |  3 ---
 .vim/after/ftplugin/python.vim |  3 ---
 .vimrc                         | 15 +++------------
 4 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 .vim/after/ftplugin/html.vim
 delete mode 100644 .vim/after/ftplugin/php.vim

diff --git a/.vim/after/ftplugin/html.vim b/.vim/after/ftplugin/html.vim
deleted file mode 100644
index 8f84179..0000000
--- a/.vim/after/ftplugin/html.vim
+++ /dev/null
@@ -1 +0,0 @@
-setlocal tw=0
diff --git a/.vim/after/ftplugin/php.vim b/.vim/after/ftplugin/php.vim
deleted file mode 100644
index 67c8c5f..0000000
--- a/.vim/after/ftplugin/php.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-setlocal ts=4
-setlocal sts=4
-setlocal sw=4
diff --git a/.vim/after/ftplugin/python.vim b/.vim/after/ftplugin/python.vim
index d3ef77d..5b22118 100644
--- a/.vim/after/ftplugin/python.vim
+++ b/.vim/after/ftplugin/python.vim
@@ -1,4 +1 @@
 set cinwords=if,elif,else,for,while,try,except,finally,def,class
-setlocal ts=4
-setlocal sts=4
-setlocal sw=4
diff --git a/.vimrc b/.vimrc
index fbd7952..74c693f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -5,17 +5,9 @@ call vundle#begin()
 
 Plugin 'VundleVim/Vundle.vim'
 Plugin 'bling/vim-airline'
-Plugin 'pangloss/vim-javascript'
-Plugin 'tpope/vim-markdown'
-Plugin 'othree/html5.vim'
-Plugin 'elzr/vim-json'
 Plugin 'hail2u/vim-css3-syntax'
 Plugin 'cakebaker/scss-syntax.vim'
-Plugin 'wting/rust.vim'
-Plugin 'hynek/vim-python-pep8-indent'
-Plugin 'StanAngeloff/php.vim'
 Plugin 'altercation/vim-colors-solarized'
-Plugin 'tpope/vim-fugitive'
 Plugin 'vim-airline/vim-airline-themes'
 call vundle#end()
 
@@ -39,17 +31,16 @@ set ffs=unix
 set ff=unix
 
 " Indentation stuff
-" 2-space everything
 set tabstop=2
 set softtabstop=2
 set shiftwidth=2
-set expandtab
+set noexpandtab
 " Old school
 set textwidth=80
 set colorcolumn=+1
-" Auto wrap long lines
-set formatoptions+=t
+
 set autoindent
+set smartindent
 
 " Look and feel
 set encoding=utf-8