Skip to content

Commit e8929fe

Browse files
ApplicationDeveloperApplicationDeveloper
authored
Update .vimrc
1 parent 95539e8 commit e8929fe

File tree

1 file changed

+61
-51
lines changed

1 file changed

+61
-51
lines changed

‎.vimrc

+61-51
Original file line numberDiff line numberDiff line change
@@ -18,52 +18,70 @@ Plugin 'tpope/vim-fugitive'
1818
Plugin 'scrooloose/nerdtree'
1919
Plugin 'scrooloose/syntastic'
2020
Plugin 'scrooloose/nerdcommenter'
21-
" Plugin 'kien/ctrlp.vim'
2221
Plugin 'vim-airline/vim-airline'
2322
Plugin 'vim-airline/vim-airline-themes'
2423
Plugin 'airblade/vim-gitgutter'
25-
Plugin 'majutsushi/tagbar'
2624
Plugin 'dracula/vim'
2725
Plugin 'altercation/vim-colors-solarized'
2826
Plugin 'morhetz/gruvbox'
27+
Plugin 'acoustichero/simple_dark'
2928
Plugin 'junegunn/goyo.vim'
3029
Plugin 'tomasr/molokai'
3130
Plugin 'lifepillar/vim-mucomplete'
31+
Plugin 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
3232
Plugin 'junegunn/fzf.vim'
33-
" Plugin 'yggdroot/indentline'
3433
" plugin from http://vm-scripts.org/vim/scripts.html
3534
" Plugin 'L9'
3635
" Git plugin not hosted on GitHub
3736
" Plugin 'git://git.wincent.com/command-t.git'
3837
" git repos on your local machine (i.e. when working on your own plugin)
3938
" Plugin 'file:///home/gmarik/path/to/plugin'
40-
" The sparkup vim script is in a subdirectory of this repo called vim.
41-
" Pass the path to set the runtimepath properly.
42-
Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
43-
" Install L9 and avoid a Naming conflict if you've already installed a
44-
" different version somewhere else.
45-
" Plugin 'ascenator/L9', {'name': 'newL9'}
46-
47-
" All of your Plugins must be added before the following line
48-
call vundle#end() " required
49-
filetype plugin indent on " required
50-
" To ignore plugin indent changes, instead use:
51-
"filetype plugin on
52-
"
53-
" Brief help
54-
" :PluginList - lists configured plugins
39+
" The sparkup vim script is in a subdirectory of this repo called vim.
40+
" Pass the path to set the runtimepath properly.
41+
Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
42+
" Install L9 and avoid a Naming conflict if you've already installed a
43+
" different version somewhere else.
44+
" Plugin 'ascenator/L9', {'name': 'newL9'}
45+
" All of your Plugins must be added before the following line
46+
call vundle#end() " required
47+
filetype plugin indent on " required
48+
" To ignore plugin indent changes, instead use:
49+
"filetype plugin on
50+
" Brief help
51+
" :PluginList - lists configured plugins
5552
" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate
5653
" :PluginSearch foo - searches for foo; append `!` to refresh local cache
5754
" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal
5855
"
5956
" see :h vundle for more details or wiki for FAQ
6057
" Put your non-Plugin stuff after this line
6158

59+
set number "relativenumber
60+
set textwidth=99
61+
set autoindent
62+
"set colorcolumn=101
63+
set nowrap
64+
set softtabstop=4 shiftwidth=4 expandtab
65+
set background=dark
66+
set title
67+
set hlsearch
68+
set incsearch
69+
set clipboard=unnamed
70+
set showcmd
71+
" Auto indent when copy pasting
72+
set pastetoggle=<F3>
73+
" Fuzzy file built-in
74+
set path+=**
75+
set wildmenu
76+
set wildignore+=*/min/*,*/vendor/*,*/node_modules/*,*/bower_components/*,*/storage/*
77+
set backupdir=~/.vim/tmp//,.
78+
set directory=~/.vim/tmp//,.
79+
6280
" Airline config
6381
let g:airline_powerline_fonts=1
6482

6583
" AirlineTheme config
66-
let g:airline_theme='ubaryd'
84+
let g:airline_theme='luna'
6785

6886
" Signify config
6987
let g:signify_vcs_list=['git']
@@ -77,26 +95,6 @@ let g:tagbar_ctags_bin="/usr/local/bin/ctags"
7795

7896
"let g:solarized_termcolors=256
7997

80-
set number "relativenumber
81-
set textwidth=99
82-
"set colorcolumn=101
83-
set softtabstop=2 shiftwidth=2 expandtab
84-
set background=dark
85-
set title
86-
set hlsearch
87-
88-
" Auto indent when copy pasting
89-
set pastetoggle=<F3>
90-
91-
"set cursorline
92-
set clipboard=unnamed
93-
set showcmd
94-
95-
" Fuzzy file built-in
96-
set path+=**
97-
set wildmenu
98-
set wildignore+=*/min/*,*/vendor/*,*/node_modules/*,*/bower_components/*,*/storage/*
99-
10098
" MuComplete
10199
set completeopt+=menuone,noselect
102100
let g:mucomplete#enable_auto_at_startup=1
@@ -137,12 +135,22 @@ let g:NERDSpaceDelims=1
137135
let g:NERDCustomDelimiters={'c':{ 'left': '/**', 'right': '*/'}}
138136
let g:NERDCommentEmptyLines=1
139137

140-
"if &term =~ '256color' || &term == 'screen'
141-
" " Disable Background Color Erase (BCE) so that color schemes
142-
" " " work properly when Vim is used inside tmux and GNU screen.
143-
" set t_ut=
144-
" set t_Co=256
145-
"endif
138+
" Syntastic config
139+
set statusline+=%#warningmsg#
140+
set statusline+=%{SyntasticStatuslineFlag()}
141+
set statusline+=%*
142+
143+
let g:syntastic_always_populate_loc_list = 1
144+
let g:syntastic_auto_loc_list = 1
145+
let g:syntastic_check_on_open = 1
146+
let g:syntastic_check_on_wq = 0
147+
148+
if &term =~ '256color' || &term == 'screen'
149+
" Disable Background Color Erase (BCE) so that color schemes
150+
" " work properly when Vim is used inside tmux and GNU screen.
151+
set t_ut=
152+
set t_Co=256
153+
endif
146154

147155
if &term == 'linux' || &term == 'screen'
148156
" colorscheme solarized
@@ -151,25 +159,26 @@ else
151159
endif
152160

153161
au BufRead,BufNewFile *.vue set filetype=html
154-
autocmd FileType html setlocal shiftwidth=2 tabstop=2
155-
autocmd FileType vue setlocal shiftwidth=2 tabstop=2
162+
autocmd FileType html setlocal shiftwidth=2 softtabstop=2 expandtab
163+
autocmd FileType vue setlocal shiftwidth=2 softtabstop=2 expandtab
164+
autocmd FileType js setlocal shiftwidth=4 softtabstop=4 expandtab
156165
"Allow transparent bg
157166
"autocmd ColorScheme * highlight Normal ctermbg=None
158167

159-
autocmd ColorScheme * highlight Comment cterm=italic
168+
"autocmd ColorScheme * highlight Comment cterm=italic
160169

170+
"let g:mucomplete#enable_auto_at_startup = 0
161171
syntax enable
162172
" colorscheme github
163173
" colorscheme gruvbox
164174
" colorscheme solarized
165-
colorscheme molokai
175+
colorscheme simple_dark
166176

167177
" FZF Key Bindings
168178
nmap <C-P> :Files<CR>
169-
170-
" Key Bindings
171179
nmap <F7> :NERDTreeToggle<CR>
172180
nmap <F8> :TagbarToggle<CR>
181+
nmap <C-S-F> :Ag<CR>
173182
174183
" Auto Session
175184
" function! MakeSession()
@@ -205,3 +214,4 @@ augroup END
205214
" au VimLeave * :call MakeSession()
206215
" au BufRead,BufEnter,BufNewFile * IndentLinesReset
207216
" au VimEnter * Goyo
217+
com! -bar -bang Ag call fzf#vim#ag(<q-args>, fzf#vim#with_preview({'options': '--delimiter=: --nth=4..'}, 'right'), <bang>0)

0 commit comments

Comments
 (0)