Remove old unused makefile garbage and other cleanup

1 files changed, 25 insertions, 42 deletions

diff --git a/init.vim b/init.vim
index 980904b..fae6d29 100644
--- a/init.vim
+++ b/init.vim
@@ -9,7 +9,7 @@ set nomodeline
 execute pathogen#infect('bundle/{}', 'themes/{}')
 
 " Allow me to hide buffers w/o saving
-set hidden
+" set hidden
 
 " Persistent undo
 set undofile
@@ -28,7 +28,7 @@ inoremap <Up>    <NOP>
 inoremap <Down>  <NOP>
 
 " Always show status line
-set laststatus=2
+" set laststatus=2
 
 " Case insensitive searching by default
 set ic
@@ -41,55 +41,38 @@ 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>
-"
+" Omni completion
+filetype plugin on
+set omnifunc=syntaxcomplete#Complete
+
+let g:ctrlp_follow_symlinks = 1
+let g:ctrlp_working_path_mode = 0
+
 " Enable the list of buffers
 let g:airline#extensions#tabline#enabled = 1
 
 " Show just the filename
 let g:airline#extensions#tabline#fnamemod = ':t'
 
-" if !exists('g:airline_symbols')
-"   let g:airline_symbols = {}
-" endif
-" let g:airline_symbols.space = "\ua0"
+if !exists('g:airline_symbols')
+  let g:airline_symbols = {}
+endif
+let g:airline_symbols.space = "\ua0"
 
 let g:airline_section_z = airline#section#create(['windowswap', '%3p%% ', 'linenr', ':%3v'])
 
 
-" 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()
 autocmd Filetype json call SetJsonOptions()
@@ -103,8 +86,8 @@ autocmd Filetype markdown call SetMarkdownOptions()
 
 function SetMarkdownOptions()
 	set spell
-	set tabstop=4
-	set shiftwidth=4
+	set tabstop=2
+	set shiftwidth=2
 	set expandtab
 	AcpDisable
 endfunction
@@ -160,9 +143,9 @@ function SetShellOptions()
 	set smartindent
 endfunction
 function SetGoOptions()
-	" colorscheme acme
-	" syntax off
-	" colorscheme 256_noir
+	set tabstop=8
+	set noexpandtab
+	# The ACP is pretty slow with my Go plugins enabled
 	AcpDisable
 	set nolist
 	set noic
@@ -170,6 +153,9 @@ function SetGoOptions()
 endfunction
 function SetYamlOptions()
 	" set listchars=tab:▸\ ,eol:¬,trail:•,space:·
+	set tabstop=2
+	set shiftwidth=2
+	set expandtab
 	set listchars=tab:▸\ ,eol:¬,trail:•
 	set expandtab
 	set noic
@@ -192,14 +178,10 @@ augroup END
 nmap <leader>l :set list!<CR>
 " If you want listchars
 set list
+" If you don't have a UTF8 compatible terminal you'll want to use this line
+" instead
 " 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
@@ -211,8 +193,9 @@ endif
 
 " Line numbers
 set nu
+" Backslash-n ( \-n ) will toggle line numbers on and off
+nmap <leader>n :set invnu<CR>
 
 " Derp
 syntax on
-" syntax off
 colorscheme distinguished