Add a makefile to rework init.vim. Commit update init.vm TODO: remove in the future and run make in setup

1 files changed, 71 insertions, 97 deletions

diff --git a/init.vim b/init.vim
index eeb35e4..7a0e6d0 100644
--- a/init.vim
+++ b/init.vim
@@ -1,46 +1,10 @@
-scriptencoding utf-8
-set encoding=utf-8
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"  I Figured I should start taking notes for the eventual time I forget some
-"  shit
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" If you want to take the current buffer and save it as some fancy ass
-" formatted HTML then you can just use the :TOhtml Command
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-execute pathogen#infect('bundle/{}', 'themes/{}')
-
-" Maily for the ability to match HTML tags with '%'
-runtime macros/matchit.vim
-
-" colorscheme 256_noir
-
-" My old standard theme
-colorscheme distinguished
-" colorscheme solarized
-" set background=dark
-
-" colorscheme solarized
-" let g:solarized_termcolors=256
-" set background=dark
-
-
-" Love hate relationship with this thing. I guess it's back
-map <C-n> :NERDTreeToggle<CR>
-
-
-" To enable/disable the autocomplete dropdown
-nmap <leader> [ :AcpDisable<CR>
-nmap <leader> ] :AcpEnable<CR>
+set encoding=utf-8  " The encoding displayed.
+set fileencoding=utf-8  " The encoding written to file.
 
-" Gundo
-nnoremap <F5> :GundoToggle<CR>
+" Apparently there are security issues with this?
+set nomodeline
 
-" Show me where I should end my lines
-set colorcolumn=80
+execute pathogen#infect('bundle/{}', 'themes/{}')
 
 " Allow me to hide buffers w/o saving
 set hidden
@@ -54,85 +18,67 @@ set undoreload=10000
 " lots of history, it's always nice to find old nasty command that happen
 " to be really useful
 set history=10000
-
-" Be smart about the mouse
-set mouse+=a
-if &term =~ '^screen'
-	" tmux knows the extended mouse mode
-	set ttymouse=xterm2
-endif
-
-" Always show status line
-set laststatus=2
-
-" Enable the list of buffers
-let g:airline#extensions#tabline#enabled = 1
-
-" Show just the filename
-let g:airline#extensions#tabline#fnamemod = ':t'
-
-" Backslash l
-nmap <leader>l :set list!<CR>
-" If you want listchars
-set list
-" set listchars=tab:\|\ 
-set listchars=tab:▸\ ,eol:¬,trail:•
-" set listchars=tab:▸\ ,eol:¬
-" set listchars=tab:\|\ ,eol:↴
-" set listchars=tab:\|\ ,eol:$
-" set listchars=tab:\⇒\ ,eol:↴
-" Tabs show up as MARCON, aka 0xC2 0xAF
-" Misc symbols for tabs: ¯ ⇒ ⇥ ⇨ ⇏ ⇸ →
-
-" This lets you just hit enter instead
-" of pressing control-n Some people like it
-" personally I'm not that much of a fan
-" set completeopt=longest,menuone
-
-" Omni completion
-filetype plugin on
-set omnifunc=syntaxcomplete#Complete
-
+"
 " Keep the newbs from using arrow keys
 inoremap <Left>  <NOP>
 inoremap <Right> <NOP>
 inoremap <Up>    <NOP>
 inoremap <Down>  <NOP>
 
-nmap <F8> :TagbarToggle<CR>
-
-let g:ctrlp_follow_symlinks = 1
-let g:ctrlp_working_path_mode = 0
-
-" Line numbers
-set nu
-
-" Derp
-syntax on
-" syntax off
+" Always show status line
+set laststatus=2
 
 " Case insensitive searching by default
 set ic
 " Highlight my searches by default
 set hls
 
-set encoding=utf-8  " The encoding displayed.
-set fileencoding=utf-8  " The encoding written to file.
-
-" Do not read modeline from comments
-set nomodeline
-
 " No more swap files
 set updatecount=0
 
 " Vi in-compatibility
 set nocompatible
 
+
+" Bring down the tab spacing
 set tabstop=4
 set shiftwidth=4
 set noexpandtab
 
 
+" Maily for the ability to match HTML tags with '%'
+runtime macros/matchit.vim
+
+" Love hate relationship with this thing. I guess it's back
+map <C-n> :NERDTreeToggle<CR>
+
+
+" To enable/disable the autocomplete dropdown
+nmap <leader> [ :AcpDisable<CR>
+nmap <leader> ] :AcpEnable<CR>
+
+" Gundo
+nnoremap <F5> :GundoToggle<CR>
+"
+" Enable the list of buffers
+let g:airline#extensions#tabline#enabled = 1
+
+" Show just the filename
+let g:airline#extensions#tabline#fnamemod = ':t'
+
+" This lets you just hit enter instead
+" of pressing control-n Some people like it
+" personally I'm not that much of a fan
+" set completeopt=longest,menuone
+
+" Omni completion
+filetype plugin on
+set omnifunc=syntaxcomplete#Complete
+
+nmap <F8> :TagbarToggle<CR>
+
+let g:ctrlp_follow_symlinks = 1
+let g:ctrlp_working_path_mode = 0
 
 autocmd Filetype python call SetPythonOptions()
 autocmd Filetype htmldjango call SethtmldjangoOptions()
@@ -232,3 +178,31 @@ augroup phpSyntaxOverride
   autocmd!
   autocmd FileType php call PhpSyntaxOverride()
 augroup END
+" Backslash l
+nmap <leader>l :set list!<CR>
+" If you want listchars
+set list
+" set listchars=tab:\|\ 
+set listchars=tab:▸\ ,eol:¬,trail:•
+" set listchars=tab:▸\ ,eol:¬
+" set listchars=tab:\|\ ,eol:↴
+" set listchars=tab:\|\ ,eol:$
+" set listchars=tab:\⇒\ ,eol:↴
+" Tabs show up as MARCON, aka 0xC2 0xAF
+" Misc symbols for tabs: ¯ ⇒ ⇥ ⇨ ⇏ ⇸ →
+
+" Be smart about the mouse
+set mouse+=a
+if &term =~ '^screen'
+	" tmux knows the extended mouse mode
+	set ttymouse=xterm2
+endif
+
+
+" Line numbers
+set nu
+
+" Derp
+syntax on
+" syntax off
+colorscheme distinguished