From 3f4c7b50800709c095878f0d1d42eca269735072 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Sat, 15 Feb 2014 19:22:44 -0600
Subject: [PATCH] cleaning up vimrc and plugins

---
 vim/vim.symlink/plugins.vim | 64 ++++++++++++++++++++-----------------
 vim/vimrc.symlink           | 24 ++++----------
 2 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/vim/vim.symlink/plugins.vim b/vim/vim.symlink/plugins.vim
index 4a32bb1..e784804 100644
--- a/vim/vim.symlink/plugins.vim
+++ b/vim/vim.symlink/plugins.vim
@@ -1,10 +1,12 @@
+filetype off
+
 set rtp+=~/.vim/bundle/vundle/
 call vundle#rc()
 
 " let vundle manage vundle
 Bundle 'gmarik/vundle'
 
-" my vim plugins
+" utilities
 Bundle 'kien/ctrlp.vim'
 Bundle 'scrooloose/nerdtree'
 Bundle 'mileszs/ack.vim'
@@ -12,45 +14,47 @@ Bundle 'Raimondi/delimitMate'
 Bundle 'tpope/vim-commentary'
 Bundle 'tpope/vim-unimpaired'
 Bundle 'tpope/vim-endwise'
+Bundle 'tpope/vim-ragtag'
+Bundle 'tpope/vim-surround'
+Bundle 'tsaleh/vim-matchit'
+Bundle 'benmills/vimux'
+Bundle 'bling/vim-airline'
+Bundle 'scrooloose/syntastic'
+Bundle 'ciaranm/detectindent'
 Bundle 'tpope/vim-fugitive'
+Bundle 'terryma/vim-multiple-cursors'
+Bundle 'tpope/vim-repeat'
+Bundle 'tonchis/to-github-vim'
+Bundle 'garbas/vim-snipmate'
+Bundle 'mattn/emmet-vim'
+Bundle 'editorconfig/editorconfig-vim'
+Bundle "MarcWeber/vim-addon-mw-utils"
+Bundle "tomtom/tlib_vim"
+Bundle 'sotte/presenting.vim'
+Bundle 'ervandew/supertab'
+
+" colorschemes
+Bundle 'ap/vim-css-color'
+Bundle 'flazz/vim-colorschemes'
+Bundle 'nanotech/jellybeans.vim'
+Bundle 'w0ng/vim-hybrid'
+
+" languages
 Bundle 'othree/html5.vim'
 Bundle 'pangloss/vim-javascript'
 Bundle 'itspriddle/vim-jquery'
 Bundle 'tpope/vim-markdown'
 Bundle 'wavded/vim-stylus'
-Bundle 'tpope/vim-ragtag'
-Bundle 'tpope/vim-surround'
-Bundle 'duff/vim-scratch'
-Bundle 'digitaltoad/vim-jade'
-" Bundle 'sjl/vitality.vim'
-Bundle 'cakebaker/scss-syntax.vim'
-Bundle 'kchmck/vim-coffee-script'
 Bundle 'groenewege/vim-less'
-Bundle 'tsaleh/vim-matchit'
-Bundle 'benmills/vimux'
-Bundle 'mattn/emmet-vim'
-Bundle 'ap/vim-css-color'
-Bundle 'flazz/vim-colorschemes'
-Bundle 'editorconfig/editorconfig-vim'
+Bundle 'digitaltoad/vim-jade'
 Bundle 'juvenn/mustache.vim'
-Bundle 'tclem/vim-arduino'
-Bundle 'bling/vim-airline'
-Bundle 'scrooloose/syntastic'
-Bundle "MarcWeber/vim-addon-mw-utils"
-Bundle "tomtom/tlib_vim"
-Bundle 'garbas/vim-snipmate'
-Bundle 'terryma/vim-multiple-cursors'
-Bundle 'tpope/vim-repeat'
-Bundle 'tonchis/to-github-vim'
-Bundle 'sotte/presenting.vim'
 Bundle 'moll/vim-node'
 Bundle 'elzr/vim-json'
 Bundle 'leafgarland/typescript-vim'
 Bundle 'jnwhiteh/vim-golang'
-Bundle 'ervandew/supertab'
-Bundle 'nanotech/jellybeans.vim'
 Bundle 'dart-lang/dart-vim-plugin'
-" Bundle 'Valloric/YouCompleteMe'
-" Bundle 'marijnh/tern_for_vim'
-Bundle 'w0ng/vim-hybrid'
-Bundle 'ciaranm/detectindent'
+Bundle 'cakebaker/scss-syntax.vim'
+Bundle 'kchmck/vim-coffee-script'
+Bundle 'tclem/vim-arduino'
+
+filetype plugin indent on
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index c43c345..d6c36d6 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -1,26 +1,18 @@
-" vim settings
-
-if (!exists('vimrc_already_sourced'))
-    filetype off
-    source ~/.vim/plugins.vim
-    filetype plugin indent on
-endif
-
-
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => General
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
+" load plugins from vundle
+source ~/.vim/plugins.vim
+
 " load functions
 source ~/.vim/functions.vim
 
-"""" Abbreviations
+" Abbreviations
 abbr funciton function
 abbr teh the
 abbr tempalte template
 
-"set winwidth=120
-
 set nocompatible " not compatible with vi
 set autoread " detect when a file is changed
 
@@ -31,8 +23,7 @@ set backspace=indent,eol,start
 let mapleader = ","
 let g:mapleader = ","
 
-" change history to 1000
-set history=10000
+set history=10000 " change history to 1000
 " set textwidth=80
 
 " Tab control
@@ -80,7 +71,7 @@ if has("autocmd") && !exists("autocommands_loaded")
 
     autocmd BufNewFile,BufRead *.ejs set filetype=html
     autocmd BufNewFile,BufRead *.ino set filetype=c
-	autocmd BufNewFile,BufRead *.svg set filetype=xml
+    autocmd BufNewFile,BufRead *.svg set filetype=xml
 
     " make quickfix windows take all the lower section of the screen when there
     " are multiple windows open
@@ -328,6 +319,3 @@ if (has("gui_running"))
     let g:airline_powerline_fonts=0
     let g:airline_theme='solarized'
 endif
-
-let vimrc_already_sourced = 1
-