tidied up
This commit is contained in:
parent
145c2ce667
commit
a189a9762c
57
vimrc
57
vimrc
|
@ -10,109 +10,64 @@ call vundle#begin()
|
||||||
|
|
||||||
" let Vundle manage Vundle, required
|
" let Vundle manage Vundle, required
|
||||||
Plugin 'VundleVim/Vundle.vim'
|
Plugin 'VundleVim/Vundle.vim'
|
||||||
|
|
||||||
" The following are examples of different formats supported.
|
|
||||||
" Keep Plugin commands between vundle#begin/end.
|
|
||||||
" plugin on GitHub repo
|
" plugin on GitHub repo
|
||||||
Plugin 'tpope/vim-fugitive'
|
Plugin 'tpope/vim-fugitive'
|
||||||
" plugin from http://vim-scripts.org/vim/scripts.html
|
|
||||||
" Plugin 'L9'
|
|
||||||
" Git plugin not hosted on GitHub
|
|
||||||
" Requires git to be compiled with Ruby support
|
|
||||||
" Plugin 'git://git.wincent.com/command-t.git'
|
|
||||||
|
|
||||||
" git repos on your local machine (i.e. when working on your own plugin)
|
|
||||||
"Plugin 'file:///home/gmarik/path/to/plugin'
|
|
||||||
" The sparkup vim script is in a subdirectory of this repo called vim.
|
|
||||||
" Pass the path to set the runtimepath properly.
|
|
||||||
|
|
||||||
" Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
|
|
||||||
" Install L9 and avoid a Naming conflict if you've already installed a
|
|
||||||
" different version somewhere else.
|
|
||||||
" Plugin 'ascenator/L9', {'name': 'newL9'}
|
|
||||||
|
|
||||||
" Nerdtree and nerdtree-git
|
" Nerdtree and nerdtree-git
|
||||||
Plugin 'scrooloose/nerdtree.git'
|
Plugin 'scrooloose/nerdtree.git'
|
||||||
Plugin 'Xuyuanp/nerdtree-git-plugin'
|
Plugin 'Xuyuanp/nerdtree-git-plugin'
|
||||||
|
|
||||||
"css3-syntax
|
"css3-syntax
|
||||||
Plugin 'hail2u/vim-css3-syntax.git'
|
Plugin 'hail2u/vim-css3-syntax.git'
|
||||||
|
|
||||||
"scss-syntax
|
"scss-syntax
|
||||||
Plugin 'cakebaker/scss-syntax.vim'
|
Plugin 'cakebaker/scss-syntax.vim'
|
||||||
|
|
||||||
"bufexplorer
|
"bufexplorer
|
||||||
Plugin 'jlanzarotta/bufexplorer'
|
Plugin 'jlanzarotta/bufexplorer'
|
||||||
|
|
||||||
"tagbar
|
"tagbar
|
||||||
Plugin 'majutsushi/tagbar'
|
Plugin 'majutsushi/tagbar'
|
||||||
|
|
||||||
"vim-surround
|
"vim-surround
|
||||||
Plugin 'tpope/vim-surround'
|
Plugin 'tpope/vim-surround'
|
||||||
|
|
||||||
"undotree
|
"undotree
|
||||||
Plugin 'mbbill/undotree'
|
Plugin 'mbbill/undotree'
|
||||||
|
|
||||||
" gutentag
|
" gutentag
|
||||||
"Plugin 'ludovicchabant/vim-gutentags'
|
"Plugin 'ludovicchabant/vim-gutentags'
|
||||||
|
|
||||||
" vim-project-tags
|
" vim-project-tags
|
||||||
"dependancy needed:
|
"dependancy needed:
|
||||||
"https://github.com/still-dreaming-1/vim-project-tags
|
"https://github.com/still-dreaming-1/vim-project-tags
|
||||||
Plugin 'still-dreaming-1/vim-elhiv'
|
Plugin 'still-dreaming-1/vim-elhiv'
|
||||||
Plugin 'still-dreaming-1/vim-project-tags'
|
Plugin 'still-dreaming-1/vim-project-tags'
|
||||||
|
|
||||||
" Ctrlp
|
" Ctrlp
|
||||||
Plugin 'ctrlpvim/ctrlp.vim'
|
Plugin 'ctrlpvim/ctrlp.vim'
|
||||||
|
|
||||||
" Obsession
|
" Obsession
|
||||||
Plugin 'tpope/vim-obsession'
|
Plugin 'tpope/vim-obsession'
|
||||||
|
|
||||||
" vim-css-color
|
" vim-css-color
|
||||||
Plugin 'ap/vim-css-color'
|
Plugin 'ap/vim-css-color'
|
||||||
|
|
||||||
" vim-javascript-syntax
|
" vim-javascript-syntax
|
||||||
" Plugin 'jelera/vim-javascript-syntax'
|
" Plugin 'jelera/vim-javascript-syntax'
|
||||||
|
|
||||||
" vim-javascript
|
" vim-javascript
|
||||||
Plugin 'pangloss/vim-javascript'
|
Plugin 'pangloss/vim-javascript'
|
||||||
|
|
||||||
" vim-mucomplete
|
" vim-mucomplete
|
||||||
" https://github.com/lifepillar/vim-mucomplete
|
" https://github.com/lifepillar/vim-mucomplete
|
||||||
Plugin 'lifepillar/vim-mucomplete'
|
Plugin 'lifepillar/vim-mucomplete'
|
||||||
|
|
||||||
" ultisnips
|
" ultisnips
|
||||||
" https://github.com/sirver/UltiSnips
|
" https://github.com/sirver/UltiSnips
|
||||||
Plugin 'SirVer/ultisnips'
|
Plugin 'SirVer/ultisnips'
|
||||||
" and some snippets
|
" and some snippets
|
||||||
" https://github.com/honza/vim-snippets
|
" https://github.com/honza/vim-snippets
|
||||||
Plugin 'honza/vim-snippets'
|
Plugin 'honza/vim-snippets'
|
||||||
|
|
||||||
" syntastic
|
|
||||||
" https://github.com/vim-syntastic/syntastic
|
|
||||||
"Plugin 'vim-syntastic/syntastic'
|
|
||||||
|
|
||||||
" ALE
|
" ALE
|
||||||
" https://github.com/w0rp/ale
|
" https://github.com/w0rp/ale
|
||||||
Plugin 'w0rp/ale'
|
Plugin 'w0rp/ale'
|
||||||
|
|
||||||
" MatchTag
|
" MatchTag
|
||||||
" https://github.com/gregsexton/MatchTag
|
" https://github.com/gregsexton/MatchTag
|
||||||
Plugin 'gregsexton/MatchTag'
|
Plugin 'gregsexton/MatchTag'
|
||||||
|
|
||||||
" phpcomplete.vim
|
" phpcomplete.vim
|
||||||
" https://github.com/shawncplus/phpcomplete.vim
|
" https://github.com/shawncplus/phpcomplete.vim
|
||||||
Plugin 'shawncplus/phpcomplete.vim'
|
Plugin 'shawncplus/phpcomplete.vim'
|
||||||
|
|
||||||
" WordPress.vim
|
|
||||||
" https://github.com/dsawardekar/wordpress.vim
|
" https://github.com/dsawardekar/wordpress.vim
|
||||||
" For up to date Wordpress Files see:
|
" For up to date Wordpress Files see:
|
||||||
" https://github.com/joseluis/wordpress.vim-generator
|
" https://github.com/joseluis/wordpress.vim-generator
|
||||||
"Plugin 'dsawardekar/wordpress.vim'
|
"Plugin 'dsawardekar/wordpress.vim'
|
||||||
" disabled - doesn't support universal ctags?
|
" disabled - doesn't support universal ctags?
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
" All of your Plugins must be added before the following line
|
" All of your Plugins must be added before the following line
|
||||||
call vundle#end() " required
|
call vundle#end() " required
|
||||||
filetype plugin indent on " required
|
filetype plugin indent on " required
|
||||||
|
@ -137,6 +92,7 @@ set ignorecase
|
||||||
" unless search contains uppercase
|
" unless search contains uppercase
|
||||||
set smartcase
|
set smartcase
|
||||||
|
|
||||||
|
" allow hidden buffers
|
||||||
set hidden
|
set hidden
|
||||||
|
|
||||||
set bg=dark
|
set bg=dark
|
||||||
|
@ -147,6 +103,7 @@ set autoindent
|
||||||
" set width of the fold column to create a margin
|
" set width of the fold column to create a margin
|
||||||
set foldcolumn=2
|
set foldcolumn=2
|
||||||
|
|
||||||
|
|
||||||
" key mappings
|
" key mappings
|
||||||
let mapleader = "\<space>"
|
let mapleader = "\<space>"
|
||||||
|
|
||||||
|
@ -160,8 +117,6 @@ inoremap jk <esc>
|
||||||
"noremap <Left> <nop>
|
"noremap <Left> <nop>
|
||||||
"noremap <Right> <nop>
|
"noremap <Right> <nop>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
" better window navigaton
|
" better window navigaton
|
||||||
nnoremap <C-h> <C-w>h
|
nnoremap <C-h> <C-w>h
|
||||||
nnoremap <C-l> <C-w>l
|
nnoremap <C-l> <C-w>l
|
||||||
|
@ -223,13 +178,6 @@ set statusline+=%*
|
||||||
" always show statusline
|
" always show statusline
|
||||||
set laststatus=2
|
set laststatus=2
|
||||||
|
|
||||||
" set status to change the status line based on mode
|
|
||||||
if version >= 700
|
|
||||||
au InsertEnter * hi StatusLine term=reverse ctermbg=5 gui=undercurl guisp=Magenta
|
|
||||||
au InsertLeave * hi StatusLine term=reverse ctermfg=0 ctermbg=2 gui=bold,reverse
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
" set a right margin and it's colour
|
" set a right margin and it's colour
|
||||||
set colorcolumn=100
|
set colorcolumn=100
|
||||||
|
|
||||||
|
@ -398,6 +346,7 @@ call project_tags#add_language('.vimtags','vim')
|
||||||
call project_tags#add_language('.css','css')
|
call project_tags#add_language('.css','css')
|
||||||
call project_tags#add_language('.scss','scss')
|
call project_tags#add_language('.scss','scss')
|
||||||
|
|
||||||
|
" jsut some example text one two three four five Six "Seven"
|
||||||
|
|
||||||
let g:tagbar_type_css = {
|
let g:tagbar_type_css = {
|
||||||
\ 'ctagstype' : 'css',
|
\ 'ctagstype' : 'css',
|
||||||
|
|
Loading…
Reference in New Issue