Steffen Rademacker 9 years ago
parent 983356b054
commit 46d14f4894

@ -16,3 +16,4 @@ npm install -g gulp
npm install -g jsonlint npm install -g jsonlint
npm install -g npm-check-updates npm install -g npm-check-updates
npm install -g recursive-blame npm install -g recursive-blame
npm install -g vtop

@ -1,20 +0,0 @@
# solarized-light.style
# This File is part of highlight, a universal source code converter.
# See README in the highlight directory for documentation.
$DEFAULTCOLOUR=#657b83
$BGCOLOUR=#fdf6e3
$FONTSIZE=10
$KW-GROUP(kwa)=#cb4b16
$KW-GROUP(kwb)=#859900
$KW-GROUP(kwc)=#cb4b16
$KW-GROUP(kwd)=#586e75
$NUMBER=#dc322f
$ESCAPECHAR=#6c71c4
$STRING=#dc322f
$STRING-DIRECTIVE=#dc322f
$COMMENT=#93a1a1
$DIRECTIVE=#6c71c4
$LINE=#268bd2
$SYMBOL=#586e75
$MARK-LINE=#073642

17
vimrc

@ -1,4 +1,3 @@
"======================================================================
" Neobundle Setup " Neobundle Setup
"====================================================================== "======================================================================
@ -13,7 +12,6 @@ call neobundle#begin(expand('~/.vim/bundle/'))
NeoBundleFetch 'Shougo/neobundle.vim' NeoBundleFetch 'Shougo/neobundle.vim'
"======================================================================
" All bundles, syntaxes and plugins " All bundles, syntaxes and plugins
"====================================================================== "======================================================================
@ -62,7 +60,6 @@ NeoBundle 'wellle/tmux-complete.vim'
call neobundle#end() call neobundle#end()
"======================================================================
" Default sane config " Default sane config
"====================================================================== "======================================================================
@ -103,7 +100,6 @@ set display+=lastline " shorten long lastlines
set formatoptions+=j " Delete comment character when joining commented lines set formatoptions+=j " Delete comment character when joining commented lines
"======================================================================
" Searching, completion and folds " Searching, completion and folds
"====================================================================== "======================================================================
@ -123,7 +119,6 @@ set nofoldenable " dont fold by default - let me do it
set foldlevelstart=1 " deactivate folding on fileload set foldlevelstart=1 " deactivate folding on fileload
"======================================================================
" Tabs and Whitespace -- can be overridden by editorconfig " Tabs and Whitespace -- can be overridden by editorconfig
"====================================================================== "======================================================================
@ -137,7 +132,6 @@ set expandtab
set autoindent set autoindent
"======================================================================
" gui options for macvim / gvim " gui options for macvim / gvim
"====================================================================== "======================================================================
@ -150,7 +144,6 @@ if has('gui_running')
endif endif
"======================================================================
" mac terminal-vim play nicely with tmux " mac terminal-vim play nicely with tmux
"====================================================================== "======================================================================
@ -163,7 +156,6 @@ if &term =~ '^screen'
endif endif
"======================================================================
" colorscheme and optical stuff " colorscheme and optical stuff
"====================================================================== "======================================================================
@ -192,7 +184,6 @@ highlight Comment cterm=italic
highlight Conceal cterm=bold highlight Conceal cterm=bold
"======================================================================
" Custom functions " Custom functions
"====================================================================== "======================================================================
@ -205,7 +196,6 @@ function! <SID>StripTrailingWhitespaces()
endfunction endfunction
"======================================================================
" autocommands, filetypes, spelling, keywords for specific filetypes " autocommands, filetypes, spelling, keywords for specific filetypes
"====================================================================== "======================================================================
@ -240,7 +230,6 @@ autocmd vimrc FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJ
autocmd vimrc FileType xml setlocal omnifunc=xmlcomplete#CompleteTags autocmd vimrc FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
"======================================================================
" Custom key mappings and shortcuts " Custom key mappings and shortcuts
"====================================================================== "======================================================================
@ -307,7 +296,6 @@ nnoremap <F3> :Autoformat<CR>
cmap w!! w !sudo tee % >/dev/null cmap w!! w !sudo tee % >/dev/null
"======================================================================
" take me to your leader! " take me to your leader!
"====================================================================== "======================================================================
@ -344,7 +332,6 @@ nnoremap <leader>g /\v^[<\|=>]{7}( .*\|$)<CR>
nnoremap <leader>p p`[v`]= nnoremap <leader>p p`[v`]=
"======================================================================
" Plugin configuration and keymappings " Plugin configuration and keymappings
"====================================================================== "======================================================================
@ -405,6 +392,7 @@ let g:neosnippet#scope_aliases['scss'] = 'scss,css'
let g:neosnippet#scope_aliases['php'] = 'php,html' let g:neosnippet#scope_aliases['php'] = 'php,html'
let g:neosnippet#snippets_directory = '~/.vim/bundle/vim-snippets/snippets' let g:neosnippet#snippets_directory = '~/.vim/bundle/vim-snippets/snippets'
" Neosnippet - SuperTab like snippets behavior. " Neosnippet - SuperTab like snippets behavior.
smap <C-k> <Plug>(neosnippet_expand_or_jump) smap <C-k> <Plug>(neosnippet_expand_or_jump)
imap <C-k> <Plug>(neosnippet_expand_or_jump) imap <C-k> <Plug>(neosnippet_expand_or_jump)
@ -459,7 +447,6 @@ if !exists('g:neocomplete#sources#omni#input_patterns')
endif endif
"======================================================================
" The Lightline Plugin " The Lightline Plugin
"====================================================================== "======================================================================
@ -524,8 +511,6 @@ function! LightlineMode()
endfunction endfunction
"======================================================================
" The Unite Plugin " The Unite Plugin
"====================================================================== "======================================================================

Loading…
Cancel
Save