More Vim edits
- More statusline work. - Remove Startify
This commit is contained in:
parent
b05179041b
commit
632daf66a9
2 changed files with 8 additions and 27 deletions
17
vim/vimrc
17
vim/vimrc
|
@ -22,7 +22,7 @@ set tabstop=4 " How many spaces a tab is
|
||||||
set shiftwidth=4 " How many spaces to shift
|
set shiftwidth=4 " How many spaces to shift
|
||||||
set softtabstop=4 " How many spaces to use when editing
|
set softtabstop=4 " How many spaces to use when editing
|
||||||
set textwidth=80 " How long a line is
|
set textwidth=80 " How long a line is
|
||||||
set winwidth=80 " Minimum width of a window
|
set winwidth=85 " Minimum width of a window
|
||||||
set wrap " Wrap text
|
set wrap " Wrap text
|
||||||
|
|
||||||
set foldmethod=syntax " Enable folding on a syntax level
|
set foldmethod=syntax " Enable folding on a syntax level
|
||||||
|
@ -33,6 +33,8 @@ set ignorecase smartcase " Search: ignore case, unless case matters
|
||||||
set incsearch " Zoom to search results as I type
|
set incsearch " Zoom to search results as I type
|
||||||
set hlsearch " Hilight search results
|
set hlsearch " Hilight search results
|
||||||
|
|
||||||
|
let g:netrw_liststyle=3 " Netrw Tree list style
|
||||||
|
|
||||||
augroup ruby_settings " Settings for Ruby and Ruby-like langs
|
augroup ruby_settings " Settings for Ruby and Ruby-like langs
|
||||||
autocmd!
|
autocmd!
|
||||||
autocmd FileType ruby,eruby,yaml set sw=2 sts=2
|
autocmd FileType ruby,eruby,yaml set sw=2 sts=2
|
||||||
|
@ -43,16 +45,9 @@ augroup spellcheckr " Spelling, for some files...
|
||||||
autocmd BufNewFile,BufRead *.md,*.rdoc,*.txt,*.wiki setlocal spell
|
autocmd BufNewFile,BufRead *.md,*.rdoc,*.txt,*.wiki setlocal spell
|
||||||
augroup END
|
augroup END
|
||||||
|
|
||||||
" Some netrw configuration
|
|
||||||
" let g:netrw_liststyle=3
|
|
||||||
" let g:netrw_browse_split=4
|
|
||||||
" let g:netrw_winsize=25
|
|
||||||
|
|
||||||
|
|
||||||
" ==============================================================================
|
" ==============================================================================
|
||||||
" Status Line
|
" Status Line
|
||||||
" ==============================================================================
|
" ==============================================================================
|
||||||
hi StatusLineError ctermfg=15 ctermbg=1 guifg=red
|
|
||||||
set laststatus=2
|
set laststatus=2
|
||||||
set statusline=
|
set statusline=
|
||||||
set statusline+=%m
|
set statusline+=%m
|
||||||
|
@ -63,6 +58,7 @@ set statusline+=%#Pmenu#
|
||||||
set statusline+=\ %F
|
set statusline+=\ %F
|
||||||
set statusline+=%=
|
set statusline+=%=
|
||||||
set statusline+=
|
set statusline+=
|
||||||
|
set statusline+=%y\
|
||||||
set statusline+=%#StatusLine#
|
set statusline+=%#StatusLine#
|
||||||
set statusline+=\|%l\:%c\|
|
set statusline+=\|%l\:%c\|
|
||||||
set statusline+=%#SyntasticError#
|
set statusline+=%#SyntasticError#
|
||||||
|
@ -100,12 +96,15 @@ inoremap jk <esc>
|
||||||
" Remove Trailing Whitespaace
|
" Remove Trailing Whitespaace
|
||||||
nnoremap <silent> <leader>rtw :%s/\s\+$//e<CR>
|
nnoremap <silent> <leader>rtw :%s/\s\+$//e<CR>
|
||||||
|
|
||||||
" Open help topics in a full new tab
|
" Open help topic in a full new tab
|
||||||
command! -nargs=1 -complete=help H :tabnew | :set buftype=help | :h <args>
|
command! -nargs=1 -complete=help H :tabnew | :set buftype=help | :h <args>
|
||||||
|
|
||||||
" Show buffer list and prompt to choose one
|
" Show buffer list and prompt to choose one
|
||||||
nnoremap <leader>b :ls<CR>:b<space>
|
nnoremap <leader>b :ls<CR>:b<space>
|
||||||
|
|
||||||
|
" Simple mapping to dotfiles directory
|
||||||
|
nnoremap <silent> <leader>df :tabnew ~/.dotfiles/<CR>
|
||||||
|
|
||||||
" ==============================================================================
|
" ==============================================================================
|
||||||
" Plugins
|
" Plugins
|
||||||
" ==============================================================================
|
" ==============================================================================
|
||||||
|
|
|
@ -24,7 +24,6 @@ call plug#begin('~/.vim/bundle')
|
||||||
Plug 'tpope/vim-endwise'
|
Plug 'tpope/vim-endwise'
|
||||||
Plug 'vim-ruby/vim-ruby'
|
Plug 'vim-ruby/vim-ruby'
|
||||||
" Appearance Related
|
" Appearance Related
|
||||||
Plug 'mhinz/vim-startify'
|
|
||||||
Plug 'dikiaap/minimalist'
|
Plug 'dikiaap/minimalist'
|
||||||
Plug 'junegunn/goyo.vim'
|
Plug 'junegunn/goyo.vim'
|
||||||
" Syntax Related
|
" Syntax Related
|
||||||
|
@ -40,20 +39,7 @@ call plug#end()
|
||||||
set t_Co=256
|
set t_Co=256
|
||||||
colorscheme minimalist
|
colorscheme minimalist
|
||||||
|
|
||||||
" Startify configs
|
|
||||||
let g:startify_files_number = 6
|
|
||||||
let g:startify_change_to_dir = 1
|
|
||||||
let g:startify_bookmarks = [
|
|
||||||
\ '~/.dotfiles/vim/vimrc',
|
|
||||||
\ '~/.dotfiles/vim/vimrc-plugins',
|
|
||||||
\ '~/.dotfiles/tmux/tmux.conf',
|
|
||||||
\ '~/.dotfiles/makefile',
|
|
||||||
\ ]
|
|
||||||
|
|
||||||
" Syntastic configs
|
" Syntastic configs
|
||||||
" Easy mapping for Startify
|
|
||||||
nnoremap <silent> <leader>s :Startify<CR>
|
|
||||||
|
|
||||||
let g:syntastic_always_populate_loc_list = 1
|
let g:syntastic_always_populate_loc_list = 1
|
||||||
let g:syntastic_auto_loc_list = 1
|
let g:syntastic_auto_loc_list = 1
|
||||||
let g:syntastic_check_on_open = 1
|
let g:syntastic_check_on_open = 1
|
||||||
|
@ -69,7 +55,3 @@ function! NewJournal()
|
||||||
.-1read ~/.vim/templates/journal
|
.-1read ~/.vim/templates/journal
|
||||||
s/Date/\=strftime("%A, %B %d")/
|
s/Date/\=strftime("%A, %B %d")/
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
"" Easy mappings for previous/next day, since defaults don't work
|
|
||||||
nnoremap <silent><leader>dp :VimwikiDiaryPrevDay<CR>
|
|
||||||
nnoremap <silent><leader>dn :VimwikiDiaryNextDay<CR>
|
|
||||||
|
|
Loading…
Reference in a new issue