Skip to content
Snippets Groups Projects
Commit 2fa3886c authored by La Fée Verte's avatar La Fée Verte
Browse files

Merge branch 'master' of https://github.com/BradleySmall/vimrc

parents de524f71 51fff45f
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
.vim/colors/solarized.vim deleted 100644 → 0
+ 0
− 1117
View file @ de524f71
This diff is collapsed.
.vim/colors/vividchalk.vim deleted 100644 → 0
+ 0
− 191
View file @ de524f71
" Vim color scheme
" Name: vividchalk.vim
" Author: Tim Pope <vimNOSPAM@tpope.info>
" Version: 2.0
" GetLatestVimScripts: 1891 1 :AutoInstall: vividchalk.vim
" Based on the Vibrank Ink theme for TextMate
" Distributable under the same terms as Vim itself (see :help license)
if has("gui_running")
set background=dark
endif
hi clear
if exists("syntax_on")
syntax reset
endif
let colors_name = "vividchalk"
" First two functions adapted from inkpot.vim
" map a urxvt cube number to an xterm-256 cube number
fun! s:M(a)
return strpart("0245", a:a, 1) + 0
endfun
" map a urxvt colour to an xterm-256 colour
fun! s:X(a)
if &t_Co == 88
return a:a
else
if a:a == 8
return 237
elseif a:a < 16
return a:a
elseif a:a > 79
return 232 + (3 * (a:a - 80))
else
let l:b = a:a - 16
let l:x = l:b % 4
let l:y = (l:b / 4) % 4
let l:z = (l:b / 16)
return 16 + s:M(l:x) + (6 * s:M(l:y)) + (36 * s:M(l:z))
endif
endif
endfun
function! E2T(a)
return s:X(a:a)
endfunction
function! s:choose(mediocre,good)
if &t_Co != 88 && &t_Co != 256
return a:mediocre
else
return s:X(a:good)
endif
endfunction
function! s:hifg(group,guifg,first,second,...)
if a:0 && &t_Co == 256
let ctermfg = a:1
else
let ctermfg = s:choose(a:first,a:second)
endif
exe "highlight ".a:group." guifg=".a:guifg." ctermfg=".ctermfg
endfunction
function! s:hibg(group,guibg,first,second)
let ctermbg = s:choose(a:first,a:second)
exe "highlight ".a:group." guibg=".a:guibg." ctermbg=".ctermbg
endfunction
hi link railsMethod PreProc
hi link rubyDefine Keyword
hi link rubySymbol Constant
hi link rubyAccess rubyMethod
hi link rubyAttribute rubyMethod
hi link rubyEval rubyMethod
hi link rubyException rubyMethod
hi link rubyInclude rubyMethod
hi link rubyStringDelimiter rubyString
hi link rubyRegexp Regexp
hi link rubyRegexpDelimiter rubyRegexp
"hi link rubyConstant Variable
"hi link rubyGlobalVariable Variable
"hi link rubyClassVariable Variable
"hi link rubyInstanceVariable Variable
hi link javascriptRegexpString Regexp
hi link javascriptNumber Number
hi link javascriptNull Constant
highlight link diffAdded String
highlight link diffRemoved Statement
highlight link diffLine PreProc
highlight link diffSubname Comment
call s:hifg("Normal","#EEEEEE","White",87)
if &background == "light" || has("gui_running")
hi Normal guibg=Black ctermbg=Black
else
hi Normal guibg=Black ctermbg=NONE
endif
highlight StatusLine guifg=Black guibg=#aabbee gui=bold ctermfg=Black ctermbg=White cterm=bold
highlight StatusLineNC guifg=#444444 guibg=#aaaaaa gui=none ctermfg=Black ctermbg=Grey cterm=none
"if &t_Co == 256
"highlight StatusLine ctermbg=117
"else
"highlight StatusLine ctermbg=43
"endif
highlight Ignore ctermfg=Black
highlight WildMenu guifg=Black guibg=#ffff00 gui=bold ctermfg=Black ctermbg=Yellow cterm=bold
highlight Cursor guifg=Black guibg=White ctermfg=Black ctermbg=White
highlight CursorLine guibg=#333333 guifg=NONE
highlight CursorColumn guibg=#333333 guifg=NONE
highlight NonText guifg=#404040 ctermfg=8
highlight SpecialKey guifg=#404040 ctermfg=8
highlight Directory none
high link Directory Identifier
highlight ErrorMsg guibg=Red ctermbg=DarkRed guifg=NONE ctermfg=NONE
highlight Search guifg=NONE ctermfg=NONE gui=none cterm=none
call s:hibg("Search" ,"#555555","DarkBlue",81)
highlight IncSearch guifg=White guibg=Black ctermfg=White ctermbg=Black
highlight MoreMsg guifg=#00AA00 ctermfg=Green
highlight LineNr guifg=#DDEEFF ctermfg=White
call s:hibg("LineNr" ,"#222222","DarkBlue",80)
highlight Question none
high link Question MoreMsg
highlight Title guifg=Magenta ctermfg=Magenta
highlight VisualNOS gui=none cterm=none
call s:hibg("Visual" ,"#555577","LightBlue",83)
call s:hibg("VisualNOS" ,"#444444","DarkBlue",81)
call s:hibg("MatchParen","#1100AA","DarkBlue",18)
highlight WarningMsg guifg=Red ctermfg=Red
highlight Error ctermbg=DarkRed
highlight SpellBad ctermbg=DarkRed
" FIXME: Comments
highlight SpellRare ctermbg=DarkMagenta
highlight SpellCap ctermbg=DarkBlue
highlight SpellLocal ctermbg=DarkCyan
call s:hibg("Folded" ,"#110077","DarkBlue",17)
call s:hifg("Folded" ,"#aaddee","LightCyan",63)
highlight FoldColumn none
high link FoldColumn Folded
highlight DiffAdd ctermbg=4 guibg=DarkBlue
highlight DiffChange ctermbg=5 guibg=DarkMagenta
highlight DiffDelete ctermfg=12 ctermbg=6 gui=bold guifg=Blue guibg=DarkCyan
highlight DiffText ctermbg=DarkRed
highlight DiffText cterm=bold ctermbg=9 gui=bold guibg=Red
highlight Pmenu guifg=White ctermfg=White gui=bold cterm=bold
highlight PmenuSel guifg=White ctermfg=White gui=bold cterm=bold
call s:hibg("Pmenu" ,"#000099","Blue",18)
call s:hibg("PmenuSel" ,"#5555ff","DarkCyan",39)
highlight PmenuSbar guibg=Grey ctermbg=Grey
highlight PmenuThumb guibg=White ctermbg=White
highlight TabLine gui=underline cterm=underline
call s:hifg("TabLine" ,"#bbbbbb","LightGrey",85)
call s:hibg("TabLine" ,"#333333","DarkGrey",80)
highlight TabLineSel guifg=White guibg=Black ctermfg=White ctermbg=Black
highlight TabLineFill gui=underline cterm=underline
call s:hifg("TabLineFill","#bbbbbb","LightGrey",85)
call s:hibg("TabLineFill","#808080","Grey",83)
hi Type gui=none
hi Statement gui=none
if !has("gui_mac")
" Mac GUI degrades italics to ugly underlining.
hi Comment gui=italic
hi railsUserClass gui=italic
hi railsUserMethod gui=italic
endif
hi Identifier cterm=none
" Commented numbers at the end are *old* 256 color values
"highlight PreProc guifg=#EDF8F9
call s:hifg("Comment" ,"#9933CC","DarkMagenta",34) " 92
" 26 instead?
call s:hifg("Constant" ,"#339999","DarkCyan",21) " 30
call s:hifg("rubyNumber" ,"#CCFF33","Yellow",60) " 190
call s:hifg("String" ,"#66FF00","LightGreen",44,82) " 82
call s:hifg("Identifier" ,"#FFCC00","Yellow",72) " 220
call s:hifg("Statement" ,"#FF6600","Brown",68) " 202
call s:hifg("PreProc" ,"#AAFFFF","LightCyan",47) " 213
call s:hifg("railsUserMethod","#AACCFF","LightCyan",27)
call s:hifg("Type" ,"#AAAA77","Grey",57) " 101
call s:hifg("railsUserClass" ,"#AAAAAA","Grey",7) " 101
call s:hifg("Special" ,"#33AA00","DarkGreen",24) " 7
call s:hifg("Regexp" ,"#44B4CC","DarkCyan",21) " 74
call s:hifg("rubyMethod" ,"#DDE93D","Yellow",77) " 191
"highlight railsMethod guifg=#EE1122 ctermfg=1
.vimrc
+ 27
− 11
View file @ 2fa3886c
......@@ -18,6 +18,10 @@ Plug 'tpope/vim-rhubarb'
Plug 'vim-scripts/loremipsum'
Plug 'tpope/vim-surround'
" Plug 'altercation/vim-colors-solarized'
Plug 'lifepillar/vim-solarized8'
Plug 'scrooloose/nerdtree'
Plug 'Xuyuanp/nerdtree-git-plugin'
Plug 'jceb/vim-orgmode'
......@@ -65,7 +69,21 @@ filetype indent on
syntax on
syntax enable
colorscheme koehler
" ------------------------------------------------------------------
" Solarized Colorscheme Config
" ------------------------------------------------------------------
colorscheme solarized8
" call togglebg#map("")
if has('gui_running')
set background=light
else
set background=light
" set background=dark
endif
" }}}
" ------------------------------------------------------------------
" }}}
" swap file stuff --------------------------------------------------{{{
......@@ -123,16 +141,6 @@ if &t_Co > 2 || has("gui_running")
set hlsearch
endif
"if has('gui_running')
" set background=light
"else
" let g:solarized_termcolors=16
" set background=light
"endif
"set background=dark
"colorscheme solarized
" }}}
" Leader settings ------------------------{{{
let mapleader = "\\"
let maplocalleader = "\\"
......@@ -428,4 +436,12 @@ nnoremap <F8> :call UpdateTags()
" Fugitive gitlab setting --------------------------------- {{{
let g:fugitive_gitlab_domains = ['https://git.qoto.org']
" Use vimdiff as merge tool
" git mergetool
" git config merge.tool vimdiff
" git config merge.conflictstyle diff3
" git config mergetool.prompt false
" }}}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment