clean things

This commit is contained in:
Loic Nageleisen 2015-03-02 16:39:09 +01:00
parent 38b01a9dc8
commit e30dfe574d

121
vimrc
View file

@ -21,59 +21,24 @@ set timeout
set timeoutlen=1000 set timeoutlen=1000
set ttimeoutlen=50 set ttimeoutlen=50
"powerline/airline font "airline
"let g:Powerline_symbols = 'fancy'
"let g:airline_powerline_fonts = 1
"let g:airline_theme='solarized'
"let g:airline#extensions#tabline#enabled = 1
if !exists('g:airline_symbols') if !exists('g:airline_symbols')
let g:airline_symbols = {} let g:airline_symbols = {}
endif endif
" unicode symbols
let g:airline_left_sep='' let g:airline_left_sep=''
let g:airline_right_sep='' let g:airline_right_sep=''
let g:airline_symbols.linenr = '␤' let g:airline_symbols.linenr = '␤'
let g:airline_symbols.branch = '⎇' let g:airline_symbols.branch = '⎇'
"let g:airline_symbols.paste = 'ρ'
"let g:airline_symbols.paste = 'Þ'
"let g:airline_symbols.paste = '∥'
let g:airline_symbols.whitespace = 'Ξ'
"let g:airline_left_sep = '⮀' "terminal behavior and appearance
"let g:airline_left_alt_sep = '⮁' if !has('gui_running')
"let g:airline_right_sep = '⮂'
"let g:airline_right_alt_sep = '⮃'
"let g:airline_symbols.branch = '⭠'
"let g:airline_symbols.readonly = '⭤'
"let g:airline_symbols.linenr = '⭡'
"gitgutter
"let g:gitgutter_highlight_lines = 1
let g:gitgutter_escape_grep = 1
let g:gitgutter_diff_args = '-w'
"let g:gitgutter_signs = 0
let g:solarized_visibility="low"
if !has('gui_running') "
set showtabline=1 "automatic tab bar set showtabline=1 "automatic tab bar
set mouse=a "mouse support set mouse=n "mouse support
set background=dark set background=light
let g:zenburn_force_dark_Background = 1
"colorscheme zenburn
"colorscheme candy
"colorscheme grb256
"colorscheme github
"colorscheme codeschool
"colorscheme distinguished
"let g:solarized_termtrans=0
"let g:solarized_termcolors=16
"colorscheme solarized
colorscheme smyck
"use terminal background "use terminal background
"hi Normal ctermbg=none hi Normal ctermbg=none
"hi todo ctermbg=none hi todo ctermbg=none
"hi statement ctermbg=none hi statement ctermbg=none
endif endif
"ignore some files "ignore some files
@ -152,25 +117,11 @@ let mapleader = ','
set hlsearch set hlsearch
map <leader>c :nohlsearch<CR> map <leader>c :nohlsearch<CR>
map <leader>q :cw<CR>
map <leader>R :source ~/.vimrc<CR>
map <leader>t :NERDTreeToggle<CR> map <leader>t :NERDTreeToggle<CR>
map <leader>b :CtrlPBuffer<CR> map <leader>b :CtrlPBuffer<CR>
map <leader>r :CtrlPTag<CR> map <leader>r :CtrlPTag<CR>
map <leader>p :CtrlP<CR> map <leader>p :CtrlP<CR>
"coffee
vmap <leader>cc <esc>:'<,'>:CoffeeCompile<CR>
map <leader>cc :CoffeeCompile<CR>
command -nargs=1 C CoffeeCompile | :<args>
"session
nnoremap <leader>S :mksession!<CR>
"Ag
nnoremap <leader>a :Ag<SPACE>
"SuperTab options "SuperTab options
let g:SuperTabDefaultCompletionType = "context" let g:SuperTabDefaultCompletionType = "context"
" Complete options (disable preview scratch window) " Complete options (disable preview scratch window)
@ -183,45 +134,6 @@ let g:rubycomplete_buffer_loading = 1
let g:rubycomplete_classes_in_global = 1 let g:rubycomplete_classes_in_global = 1
set completeopt+=longest set completeopt+=longest
"TagBar
"let g:tagbar_usearrows = 1
"nnoremap <leader>l :TagbarToggle<CR>
"xterm control+arrows
"map  <C-Left>
"map!  <C-Left>
"map  <C-Right>
"map!  <C-Right>
"Terminal.app control+arrows
"map  <Home>
"map!  <Home>
"map  <End>
"map!  <End>
"Lion Terminal.app option+arrows
"map b <M-Left>
"map! b <M-Left>
"map f <M-Right>
"map! f <M-Right>
"Terminal.app option+arrows
"map  <M-Left>
"map!  <M-Left>
"map  <M-Right>
"map!  <M-Right>
" make meta move on words like control
"map <M-Left> <C-Left>
"map! <M-Left> <C-Left>
"map <M-Right> <C-Right>
"map! <M-Right> <C-Right>
" highlight background for >80
"highlight OverLength ctermbg=red ctermfg=white guibg=#592929
"match OverLength /\%81v.\+/
" conserve undo info
"set undofile
" restore last known cursor position " restore last known cursor position
function! ResCur() function! ResCur()
if line("'\"") <= line("$") if line("'\"") <= line("$")
@ -268,23 +180,6 @@ function! RestoreSession()
endfunction endfunction
autocmd VimEnter * call RestoreSession() autocmd VimEnter * call RestoreSession()
" relative line numbers
"function! NumberToggle()
" if(&relativenumber == 1)
" set norelativenumber
" else
" set relativenumber
" endif
"endfunc
"
"nnoremap <C-n> :call NumberToggle()<cr>
"
":au FocusLost * :set norelativenumber
":au FocusGained * :set relativenumber
"
"autocmd InsertEnter * :set norelativenumber
"autocmd InsertLeave * :set relativenumber
"matchit "matchit
source $VIMRUNTIME/macros/matchit.vim source $VIMRUNTIME/macros/matchit.vim