getting closer to vimrc

Signed-off-by: Adam Miller <[email protected]>

vimrc

@@ -9,16 +9,14 @@ Plug 'davidhalter/jedi-vim'
 Plug 'bling/vim-airline'
 Plug 'scrooloose/syntastic'
 Plug 'sjl/badwolf'
+Plug 'junegunn/vim-easy-align'
+Plug 'tpope/vim-endwise'
+
 " Initialize plugin system
 call plug#end()
 """"""""""""""""""""""""""" END VIM PLUG
 
 """"""""""""""""""""""""""" BEING GENERAL SETTINGS
-
-set relativenumber
-set number
-set cursorline
-
 " fuck the arrow keys
 noremap <left> <nop>
 noremap <up> <nop>
@@ -27,39 +25,24 @@ noremap <right> <nop>
 
 " Yank from current cursor position to end of line
 map Y y$
-" Yank content in OS's clipboard. `o` stands for "OS's Clipoard".
-vnoremap <leader>yo "*y
-" Paste content from OS's clipboard
-nnoremap <leader>po "*p
-
-" clear highlight after search
-noremap <silent><Leader>/ :nohls<CR>
 
-" Change leader
-let mapleader = "\<space>"
-
-" better ESC
-inoremap <C-k> <Esc>
-
-" Seriously, guys. It's not like :W is bound to anything anyway.
 command! W :w
 
 set modelines=0
-set noeol
-if exists('+relativenumber')
-  set relativenumber
-endif
+set relativenumber
 set numberwidth=3
 set winwidth=83
 set ruler
 set showcmd
-
+let &colorcolumn="80,".join(range(400,999),",")
 set matchtime=2
-
-set completeopt=longest,menuone,preview
 set autoindent
-""""""""""""""""""""""""""" END GENERAL SETTINGS
+set relativenumber
+set number
+set cursorline
 
+colorscheme badwolf
+""""""""""""""""""""""""""" END GENERAL SETTINGS
 
 """ Indent-guides Settings
 let g:indent_guides_enable_on_vim_startup = 1
@@ -70,17 +53,6 @@ let g:indent_guides_auto_colors = 0
 autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd  ctermbg=238
 autocmd VimEnter,Colorscheme * :hi IndentGuidesEven ctermbg=236
 
-""" Jedi settings
-let g:jedi#goto_command = "<leader>d"
-let g:jedi#goto_assignments_command = "<leader>g"
-let g:jedi#goto_definitions_command = ""
-let g:jedi#documentation_command = "K"
-let g:jedi#usages_command = "<leader>n"
-let g:jedi#completions_command = "<C-Space>"
-let g:jedi#rename_command = "<leader>r"
-
-colorscheme badwolf
-
 """ Syntastic
 let g:syntastic_check_on_wq = 0
 let g:syntastic_enable_signs=1
@@ -89,28 +61,20 @@ let g:syntastic_auto_loc_list=1
 " For sphinx, the default is something else and it drives me nuts
 let g:syntastic_rst_checkers = ['sphinx']
 
-" shortcuts because I'm lazy
+""" Airline settings
+" Set airline to use not use powerline fancy font symbols
+let g:airline_symbols_ascii = 1
+
+""" shortcuts because I'm lazy
 cnoreabbrev SC w <bar> SyntasticCheck
 cnoreabbrev SR SyntasticReset
 cnoreabbrev AR AirlineRefresh
-cnoreabbrev TT TagbarToggle
 cnoreabbrev SP set paste
 
-""" Airline settings
-" Set airline to use not use powerline fancy font symbols
-let g:airline_powerline_fonts = 0
-if !exists('g:airline_symbols')
-    let g:airline_symbols = {}
-endif
-let g:airline_left_sep = ''
-let g:airline_right_sep = ''
 
-" Random filetypes
-"
-" asciidoc - *.adoc
+""" Random filetype settings
 au BufRead,BufNewFile *.adoc set filetype=asciidoc
 autocmd BufNewFile,BufRead *.j2,*.jinja,*.jinja2  set ft=jinja
-
 autocmd FileType python setlocal expandtab sw=4 sts=4 ts=8
 autocmd FileType yaml setlocal expandtab sw=2 sts=2 ts=4
 autocmd FileType ruby setlocal expandtab sw=2 sts=2 ts=4