Permalink
Browse files

update vimrc and muon

  • Loading branch information...
jmoiron committed May 24, 2017
1 parent 3d5553f commit 5e0b2097178b2f896d35326db88e30868f72c7da
Showing with 13 additions and 10 deletions.
  1. +5 −5 home/.vim/colors/muon.vim
  2. +8 −5 home/.vimrc
View
@@ -18,13 +18,13 @@ hi LineNr ctermfg=239 ctermbg=234 gui=None
hi NonText ctermfg=234 ctermbg=234 gui=None guifg=#1c1c1c guibg=#1c1c1c
hi VertSplit ctermfg=237 ctermbg=235 cterm=none gui=None guifg=#3a3a3a guibg=#262626
hi StatusLine ctermfg=249 ctermbg=235 cterm=underline gui=underline guifg=#b2b2b2 guibg=#262626
hi StatusLine ctermfg=249 ctermbg=235 cterm=none gui=none guifg=#c2c2c2 guibg=#333333
hi StatusLineNC ctermfg=243 ctermbg=235 cterm=none gui=None guifg=#767676 guibg=#262626
hi DiffDelete ctermfg=234 ctermbg=233 gui=None guifg=#1c1c1c guibg=#121212
hi DiffAdd ctermbg=236 gui=None guibg=#303030
hi DiffChange ctermbg=235 gui=None guibg=#262626
hi DiffText ctermfg=161 ctermbg=234 cterm=underline gui=underline guifg=#df005f guibg=#1c1c1c
hi DiffText ctermfg=161 ctermbg=234 cterm=none gui=none guifg=#df005f guibg=#1c1c1c
hi Cursor ctermfg=234 ctermbg=250 gui=None guifg=#1c1c1c guibg=#bcbcbc
@@ -33,7 +33,7 @@ hi Visual ctermfg=234 ctermbg=122 gui=None
hi Folded ctermfg=244 ctermbg=235 gui=None guifg=#808080 guibg=#262626
hi FoldColumn ctermfg=244 ctermbg=234 gui=None guifg=#808080 guibg=#1c1c1c
hi IncSearch ctermfg=234 ctermbg=214 cterm=underline gui=underline guifg=#1c1c1c guibg=#ffaf00
hi IncSearch ctermfg=234 ctermbg=214 cterm=none gui=none guifg=#1c1c1c guibg=#ffaf00
hi Search ctermfg=234 ctermbg=214 cterm=none gui=None guifg=#1c1c1c guibg=#ffaf00
hi ModeMsg ctermfg=117 ctermbg=234 cterm=bold gui=bold guifg=#87dfff guibg=#1c1c1c
@@ -55,7 +55,7 @@ if version >= 700 " Vim 7.x specific colors
hi CursorLine ctermbg=235 cterm=none gui=None guibg=#262626
hi CursorColumn ctermbg=235 cterm=none gui=None guibg=#262626
hi MatchParen ctermfg=196 ctermbg=234 cterm=bold,reverse gui=bold,reverse guifg=#ff0000 guibg=#1c1c1c
hi MatchParen ctermfg=196 ctermbg=234 cterm=bold,reverse gui=bold,reverse guifg=#ffaf00 guibg=#1c1c1c
hi Tabline ctermfg=245 ctermbg=235 cterm=underline gui=underline guifg=#8a8a8a guibg=#262626
hi TablineSel ctermfg=250 ctermbg=234 cterm=bold gui=bold guifg=#bcbcbc guibg=#1c1c1c
@@ -89,7 +89,7 @@ hi Special ctermfg=050 ctermbg=234 gui=None
hi Delimiter ctermfg=153 ctermbg=234 gui=None guifg=#afdfff guibg=#1c1c1c
hi Number ctermfg=086 ctermbg=234 gui=None guifg=#5fffdf guibg=#1c1c1c
hi Ignore ctermfg=214 ctermbg=234 gui=None guifg=#ffaf00 guibg=#1c1c1c
hi Todo ctermfg=196 ctermbg=234 gui=None guifg=#ff0000 guibg=#1c1c1c
hi Todo ctermfg=196 ctermbg=234 gui=bold guifg=#ffaf00 guibg=#1c1c1c
hi Exception ctermfg=080 ctermbg=234 cterm=bold gui=bold guifg=#5fdfdf guibg=#1c1c1c
"vim: sw=4
View
@@ -122,11 +122,12 @@ set laststatus=2
" http://www.ruby-doc.org/core-2.0/File.html#method-c-fnmatch
:let g:fuzzy_ignore="*.pyc;*.swp;*.gif;*.png;**node_modules**;**lib/bootstrap**;**/migrations/**"
map <leader>p :CtrlPBufTagAll<cr>
" ctrl-h to kill the search highlight
nmap <silent> <C-H> :silent noh<CR>
" ctrl-n to toggle line numbers
nmap <silent> <C-N> :set invnumber<CR>
nmap <leader>t :FuzzyFinderTextmateRefreshFiles<CR>
" ~~ screen style keymapping ~~
set hidden
@@ -146,10 +147,11 @@ set enc=utf-8
" set laststatus=2
" set statusline=[%l,%c\ %P%M]\ %f\ %r%h%w
" map old fuzzy finder textmate keys to ctrlp
" put the ctrl-p window on the top, ordering top-to-bottom, 15 results
let g:ctrlp_match_window = 'top,order:ttb,min:1,max:15,results:15'
let g:ctrlp_working_path_mode = 0
let g:ctrlp_user_command = ['.git/']
let g:ctrlp_working_path_mode = 'ra'
let g:ctrlp_user_command = ['.git']
set wildignore +=*.pyc,*.zip,.git,.hg,.svn,node_modules,_workspace
map <F3> :CtrlP<CR>
@@ -231,7 +233,8 @@ if has("gui_running")
"exe 'colo ' . choice
"unlet mycolors
"unlet choice
colo flattr
" colo flattr
colo muon
else
colo jellybeans
endif

0 comments on commit 5e0b209

Please sign in to comment.