From 68fabc5ee00686a5e53638ab4b44c99195ee4b8f Mon Sep 17 00:00:00 2001 From: Matt Kohls Date: Wed, 15 Mar 2017 17:16:02 -0400 Subject: Cleaning up vimrc and bashrc --- .bashrc | 4 +--- .vim/bundle/Vundle.vim | 2 +- .vim/bundle/emmet-vim | 1 - .vim/bundle/gruvbox | 2 +- .vim/bundle/nerdtree | 2 +- .vim/bundle/previm | 2 +- .vim/bundle/syntastic | 2 +- .vim/bundle/vim-airline | 2 +- .vim/bundle/vim-commentary | 2 +- .vim/bundle/vim-easymotion | 1 - .vim/bundle/vim-fugitive | 2 +- .vim/bundle/vim-gitgutter | 2 +- .vim/bundle/vim-multiple-cursors | 1 - .vimrc | 39 +-------------------------------------- 14 files changed, 11 insertions(+), 53 deletions(-) delete mode 160000 .vim/bundle/emmet-vim delete mode 160000 .vim/bundle/vim-easymotion delete mode 160000 .vim/bundle/vim-multiple-cursors 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 index fef1c2f..f6cc062 160000 --- a/.vim/bundle/Vundle.vim +++ b/.vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit fef1c2f31862c44cf5295ef86c086efba4af20a9 +Subproject commit f6cc06238d5ac888ddfc514f80392f44cb2e21ac diff --git a/.vim/bundle/emmet-vim b/.vim/bundle/emmet-vim deleted file mode 160000 index f4b097a..0000000 --- a/.vim/bundle/emmet-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f4b097af50833964e15f17192f2d1c336e34936e diff --git a/.vim/bundle/gruvbox b/.vim/bundle/gruvbox index 00729ba..127c9d1 160000 --- a/.vim/bundle/gruvbox +++ b/.vim/bundle/gruvbox @@ -1 +1 @@ -Subproject commit 00729ba14e0c7dd51b1bb0b829860b8047d4dde1 +Subproject commit 127c9d14d4bac1bac31e328b835a8919a255789c diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree index 29cf96e..e671e40 160000 --- a/.vim/bundle/nerdtree +++ b/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 29cf96e45b4830a9a2351514fe102bb7a95a27d5 +Subproject commit e671e403dd1ec1da59f70605c73aaedb6cb0e637 diff --git a/.vim/bundle/previm b/.vim/bundle/previm index b5dba08..e9967c2 160000 --- a/.vim/bundle/previm +++ b/.vim/bundle/previm @@ -1 +1 @@ -Subproject commit b5dba0837b464063284a8a97e7b9e5e378db545c +Subproject commit e9967c225ddbcc67b45f6de7d3e2c5c656ef8fb6 diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic index 2b84b14..48e8b0e 160000 --- a/.vim/bundle/syntastic +++ b/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 2b84b14cd1ef0d4bb74d91ca08a8818d84d8982d +Subproject commit 48e8b0e9d2721f608fd1d1157c9388b2626cbddf diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline index 7a720bb..46b0b6b 160000 --- a/.vim/bundle/vim-airline +++ b/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 7a720bbbd74b22fc029844c9ff087bbc1e09effb +Subproject commit 46b0b6bf5a5cab3704bb8b7ba1b16b847006c571 diff --git a/.vim/bundle/vim-commentary b/.vim/bundle/vim-commentary index 73e0d9a..be79030 160000 --- a/.vim/bundle/vim-commentary +++ b/.vim/bundle/vim-commentary @@ -1 +1 @@ -Subproject commit 73e0d9a9d1f51b6cc9dc965f62669194ae851cb1 +Subproject commit be79030b3e8c0ee3c5f45b4333919e4830531e80 diff --git a/.vim/bundle/vim-easymotion b/.vim/bundle/vim-easymotion deleted file mode 160000 index 5c6f3cd..0000000 --- a/.vim/bundle/vim-easymotion +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5c6f3cd9a713491e6b32752a05c45198aa91540a diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive index aac85a2..87c1bda 160000 --- a/.vim/bundle/vim-fugitive +++ b/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit aac85a268e89a6c8be79341e130ac90256fadbd6 +Subproject commit 87c1bda4d5573185a1f79c42a919c4b62bc34c42 diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter index 402257f..1c034be 160000 --- a/.vim/bundle/vim-gitgutter +++ b/.vim/bundle/vim-gitgutter @@ -1 +1 @@ -Subproject commit 402257f920ea7e75af6c0a0c1a33ec4c0cd9d4a8 +Subproject commit 1c034be0d31168c8f4770ef7b69adb67d00d6f3d diff --git a/.vim/bundle/vim-multiple-cursors b/.vim/bundle/vim-multiple-cursors deleted file mode 160000 index 51d0717..0000000 --- a/.vim/bundle/vim-multiple-cursors +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 51d0717f63cc231f11b4b63ee5b611f589dce1b3 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 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 = '' 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='' - " 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 = "" -" set clipboard=unnamedplus -- cgit v1.2.3