Cleaning up vimrc and bashrc

14 files changed, 2 insertions, 41 deletions

diff --git a/.bashrc b/.bashrc
index a422839..698684a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -124,10 +124,8 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
-# >>>>BEGIN ADDED BY CNCHI INSTALLER<<<< #
-BROWSER=/usr/bin/chromium
+
 EDITOR=/usr/bin/vim
-# >>>>>END ADDED BY CNCHI INSTALLER<<<<< #
 
 export PAGER='vimpager'
 alias less=$PAGER
diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim
-Subproject fef1c2f31862c44cf5295ef86c086efba4af20a
+Subproject f6cc06238d5ac888ddfc514f80392f44cb2e21a
diff --git a/.vim/bundle/emmet-vim b/.vim/bundle/emmet-vim
deleted file mode 160000
-Subproject f4b097af50833964e15f17192f2d1c336e34936
diff --git a/.vim/bundle/gruvbox b/.vim/bundle/gruvbox
-Subproject 00729ba14e0c7dd51b1bb0b829860b8047d4dde
+Subproject 127c9d14d4bac1bac31e328b835a8919a255789
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
-Subproject 29cf96e45b4830a9a2351514fe102bb7a95a27d
+Subproject e671e403dd1ec1da59f70605c73aaedb6cb0e63
diff --git a/.vim/bundle/previm b/.vim/bundle/previm
-Subproject b5dba0837b464063284a8a97e7b9e5e378db545
+Subproject e9967c225ddbcc67b45f6de7d3e2c5c656ef8fb
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
-Subproject 2b84b14cd1ef0d4bb74d91ca08a8818d84d8982
+Subproject 48e8b0e9d2721f608fd1d1157c9388b2626cbdd
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
-Subproject 7a720bbbd74b22fc029844c9ff087bbc1e09eff
+Subproject 46b0b6bf5a5cab3704bb8b7ba1b16b847006c57
diff --git a/.vim/bundle/vim-commentary b/.vim/bundle/vim-commentary
-Subproject 73e0d9a9d1f51b6cc9dc965f62669194ae851cb
+Subproject be79030b3e8c0ee3c5f45b4333919e4830531e8
diff --git a/.vim/bundle/vim-easymotion b/.vim/bundle/vim-easymotion
deleted file mode 160000
-Subproject 5c6f3cd9a713491e6b32752a05c45198aa91540
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
-Subproject aac85a268e89a6c8be79341e130ac90256fadbd
+Subproject 87c1bda4d5573185a1f79c42a919c4b62bc34c4
diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter
-Subproject 402257f920ea7e75af6c0a0c1a33ec4c0cd9d4a
+Subproject 1c034be0d31168c8f4770ef7b69adb67d00d6f3
diff --git a/.vim/bundle/vim-multiple-cursors b/.vim/bundle/vim-multiple-cursors
deleted file mode 160000
-Subproject 51d0717f63cc231f11b4b63ee5b611f589dce1b
diff --git a/.vimrc b/.vimrc
index 75c21bf..de9dd72 100644
--- a/.vimrc
+++ b/.vimrc
@@ -17,23 +17,10 @@ Plugin 'morhetz/gruvbox'
 " Install flake8 for Python PEP8
 Plugin 'scrooloose/syntastic'
 
-" YouCompleteMe completions
-"Plugin 'Valloric/YouCompleteMe'
-" If YCM is unavailable for your platform, try SuperTab instead
-"Plugin 'ervandew/supertab'
-
-" Emmet, an HTML/CSS macro engine
-" The trigger key is Ctrl-y-,
-Plugin 'mattn/emmet-vim'
-
 " File tree
 " Use :NERDTree to open the tree
 Plugin 'scrooloose/nerdtree'
 
-" Sublime Text style multiple cursors
-" Use Ctrl+n to highlight matches and Ctrl+b to undo highlight
-Plugin 'terryma/vim-multiple-cursors'
-
 " Fancy statusbar
 " Powerline fonts recommended
 Plugin 'bling/vim-airline'
@@ -64,14 +51,6 @@ Plugin 'tpope/vim-commentary'
 " Use :PrevimOpen while editing Markdown to open a live preview
 Plugin 'kannokanno/previm'
 
-" Highlight trailing whitespace
-" Use :StripWhitespace to remove trailing shitespace
-" Plugin 'ntpeters/vim-better-whitespace'
-
-" Jump around Vimium-style 
-" Use Leader-Leader-Motion <target> to jump around
-Plugin 'easymotion/vim-easymotion'
-
 call vundle#end()
 filetype plugin indent on
 " END VUNDLE CONFIG
@@ -81,15 +60,6 @@ set exrc
 set secure
 
 " Color scheme
-" If using a Base16 terminal theme designed to keep the 16 ANSI colors intact
-" (a "256" variation) and have successfully modified your 256 colorspace with
-" base16-shell you must uncomment the following line
-" let base16colorspace=256
-" try
-" colorscheme 256_jungle
-" catch
-" colorscheme slate
-"endtry
 let g:gruvbox_italic=1
 colorscheme gruvbox
 set background=dark
@@ -157,12 +127,8 @@ let g:airline_powerline_fonts = 1
 let g:ctrlp_map = '<c-p>'
 let g:ctrlp_cmd = 'CtrlP'
 
-" Multiple cursors tweaks
-" Since we bound Ctrl+P, we have to rebind previous selection
-let g:multi_cursor_prev_key='<C-b>'
-
 " Command to open browser for Markdown Preview
-let g:previm_open_cmd = 'google-chrome-stable'
+let g:previm_open_cmd = 'firefox'
 
 " Syntastic Tweaks
 " Display a statusline message if errors are detected
@@ -182,7 +148,4 @@ let g:syntastic_check_on_wq = 0
 " Display diff markers between index and HEAD
 let g:gitgutter_diff_args = ' HEAD '
 
-" If using SuperTab instead of YCM, list completions top-to-bottom
-" let g:SuperTabDefaultCompletionType = "<c-n>"
-"
 set clipboard=unnamedplus