mirror of
https://github.com/fergalmoran/vimfiles.git
synced 2026-01-02 23:04:38 +00:00
Fixed conflict in .vimrc
This commit is contained in:
fergalmoran
1
.vimrc
1
.vimrc
@@ -59,5 +59,6 @@ if &term =~ "xterm"
|
||||
endif
|
||||
|
||||
|
||||
set t_Co=256
|
||||
colorscheme badwolf
|
||||
filetype on
|
||||
|
||||
139
colors/github.vim
Normal file
139
colors/github.vim
Normal file
@@ -0,0 +1,139 @@
|
||||
" Vim color file
|
||||
"
|
||||
" Author: Anthony Carapetis <anthony.carapetis@gmail.com>
|
||||
"
|
||||
" Note: Based on github's syntax highlighting theme
|
||||
" Used Brian Mock's darkspectrum as a starting point/template
|
||||
" Thanks to Ryan Heath for an easy list of some of the colours:
|
||||
" http://rpheath.com/posts/356-github-theme-for-syntax-gem
|
||||
|
||||
hi clear
|
||||
|
||||
set background=light
|
||||
if version > 580
|
||||
" no guarantees for version 5.8 and below, but this makes it stop
|
||||
" complaining
|
||||
hi clear
|
||||
if exists("syntax_on")
|
||||
syntax reset
|
||||
endif
|
||||
endif
|
||||
let g:colors_name="github"
|
||||
|
||||
hi Normal guifg=#000000 guibg=#F8F8FF
|
||||
|
||||
" {{{ Cursor
|
||||
hi Cursor guibg=#444454 guifg=#F8F8FF
|
||||
hi CursorLine guibg=#D8D8DD
|
||||
hi CursorColumn guibg=#E8E8EE
|
||||
" }}}
|
||||
|
||||
" {{{ Diff
|
||||
hi DiffAdd guifg=#003300 guibg=#DDFFDD gui=none
|
||||
hi DiffChange guibg=#ececec gui=none
|
||||
hi DiffText guifg=#000033 guibg=#DDDDFF gui=none
|
||||
hi DiffDelete guifg=#DDCCCC guibg=#FFDDDD gui=none
|
||||
" }}}
|
||||
|
||||
" {{{ Folding / Line Numbering / Status Lines
|
||||
hi Folded guibg=#ECECEC guifg=#808080 gui=bold
|
||||
hi vimFold guibg=#ECECEC guifg=#808080 gui=bold
|
||||
hi FoldColumn guibg=#ECECEC guifg=#808080 gui=bold
|
||||
|
||||
hi LineNr guifg=#959595 guibg=#ECECEC gui=bold
|
||||
hi NonText guifg=#808080 guibg=#ECECEC
|
||||
hi Folded guifg=#808080 guibg=#ECECEC gui=bold
|
||||
hi FoldeColumn guifg=#808080 guibg=#ECECEC gui=bold
|
||||
|
||||
hi VertSplit guibg=#bbbbbb guifg=#bbbbbb gui=none
|
||||
hi StatusLine guibg=#bbbbbb guifg=#404040 gui=bold
|
||||
hi StatusLineNC guibg=#d4d4d4 guifg=#404040 gui=italic
|
||||
" }}}
|
||||
|
||||
" {{{ Misc
|
||||
hi ModeMsg guifg=#990000
|
||||
hi MoreMsg guifg=#990000
|
||||
|
||||
hi Title guifg=#ef5939
|
||||
hi WarningMsg guifg=#ef5939
|
||||
hi SpecialKey guifg=#177F80 gui=italic
|
||||
|
||||
hi MatchParen guibg=#cdcdfd guifg=#000000
|
||||
hi Underlined guifg=#000000 gui=underline
|
||||
hi Directory guifg=#990000
|
||||
" }}}
|
||||
|
||||
" {{{ Search, Visual, etc
|
||||
hi Visual guifg=#FFFFFF guibg=#3465a4 gui=none
|
||||
hi VisualNOS guifg=#FFFFFF guibg=#204a87 gui=none
|
||||
hi IncSearch guibg=#cdcdfd guifg=#000000 gui=italic
|
||||
hi Search guibg=#cdcdfd guifg=#000000 gui=italic
|
||||
" }}}
|
||||
|
||||
" {{{ Syntax groups
|
||||
hi Ignore guifg=#808080
|
||||
hi Identifier guifg=#0086B3
|
||||
hi PreProc guifg=#A0A0A0 gui=bold
|
||||
hi Comment guifg=#999988
|
||||
hi Constant guifg=#177F80 gui=none
|
||||
hi String guifg=#D81745
|
||||
hi Function guifg=#990000 gui=bold
|
||||
hi Statement guifg=#000000 gui=bold
|
||||
hi Type guifg=#445588 gui=bold
|
||||
hi Number guifg=#1C9898
|
||||
hi Todo guifg=#FFFFFF guibg=#990000 gui=bold
|
||||
hi Special guifg=#159828 gui=bold
|
||||
hi rubySymbol guifg=#960B73
|
||||
hi Error guibg=#f8f8ff guifg=#ff1100 gui=undercurl
|
||||
hi Todo guibg=#f8f8ff guifg=#ff1100 gui=underline
|
||||
hi Label guifg=#000000 gui=bold
|
||||
hi StorageClass guifg=#000000 gui=bold
|
||||
hi Structure guifg=#000000 gui=bold
|
||||
hi TypeDef guifg=#000000 gui=bold
|
||||
" }}}
|
||||
|
||||
" {{{ Completion menus
|
||||
hi WildMenu guifg=#7fbdff guibg=#425c78 gui=none
|
||||
|
||||
hi Pmenu guibg=#808080 guifg=#ffffff gui=bold
|
||||
hi PmenuSel guibg=#cdcdfd guifg=#000000 gui=italic
|
||||
hi PmenuSbar guibg=#000000 guifg=#444444
|
||||
hi PmenuThumb guibg=#aaaaaa guifg=#aaaaaa
|
||||
" }}}
|
||||
|
||||
" {{{ Spelling
|
||||
hi spellBad guisp=#fcaf3e
|
||||
hi spellCap guisp=#73d216
|
||||
hi spellRare guisp=#fcaf3e
|
||||
hi spellLocal guisp=#729fcf
|
||||
" }}}
|
||||
|
||||
" {{{ Aliases
|
||||
hi link cppSTL Function
|
||||
hi link cppSTLType Type
|
||||
hi link Character Number
|
||||
hi link htmlTag htmlEndTag
|
||||
"hi link htmlTagName htmlTag
|
||||
hi link htmlLink Underlined
|
||||
hi link pythonFunction Identifier
|
||||
hi link Question Type
|
||||
hi link CursorIM Cursor
|
||||
hi link VisualNOS Visual
|
||||
hi link xmlTag Identifier
|
||||
hi link xmlTagName Identifier
|
||||
hi link shDeref Identifier
|
||||
hi link shVariable Function
|
||||
hi link rubySharpBang Special
|
||||
hi link perlSharpBang Special
|
||||
hi link schemeFunc Statement
|
||||
"hi link shSpecialVariables Constant
|
||||
"hi link bashSpecialVariables Constant
|
||||
" }}}
|
||||
|
||||
" {{{ Tabs (non-gui0
|
||||
hi TabLine guifg=#404040 guibg=#dddddd gui=none
|
||||
hi TabLineFill guifg=#404040 guibg=#dddddd gui=none
|
||||
hi TabLineSel guifg=#404040 gui=bold
|
||||
" }}}
|
||||
"
|
||||
" vim: sw=4 ts=4 foldmethod=marker
|
||||
103
colors/guardian.vim
Normal file
103
colors/guardian.vim
Normal file
@@ -0,0 +1,103 @@
|
||||
" Vim color file
|
||||
" Maintainer: Anders Korte <anderskorte@eml.cc>
|
||||
" Last Change: 6 Apr 2005
|
||||
|
||||
" Guardian color scheme 1.2
|
||||
|
||||
" Rich-syntax colors for source editing and other vimming.
|
||||
|
||||
set background=dark
|
||||
hi clear
|
||||
syntax reset
|
||||
|
||||
" Colors for the User Interface.
|
||||
|
||||
hi Cursor guibg=#cc4455 guifg=white gui=bold ctermbg=4 ctermfg=15
|
||||
hi link CursorIM Cursor
|
||||
hi Normal guibg=#332211 guifg=white gui=none ctermbg=0 ctermfg=15
|
||||
hi NonText guibg=#445566 guifg=#ffeecc gui=bold ctermbg=8 ctermfg=14
|
||||
hi Visual guibg=#557799 guifg=white gui=none ctermbg=9 ctermfg=15
|
||||
|
||||
hi Linenr guibg=bg guifg=#aaaaaa gui=none ctermbg=bg ctermfg=7
|
||||
|
||||
hi Directory guibg=bg guifg=#337700 gui=none ctermbg=bg ctermfg=10
|
||||
|
||||
hi IncSearch guibg=#0066cc guifg=white gui=none ctermbg=1 ctermfg=15
|
||||
hi link Seach IncSearch
|
||||
|
||||
hi SpecialKey guibg=bg guifg=fg gui=none ctermbg=bg ctermfg=fg
|
||||
hi Titled guibg=bg guifg=fg gui=none ctermbg=bg ctermfg=fg
|
||||
|
||||
hi ErrorMsg guibg=bg guifg=#ff0000 gui=bold ctermbg=bg ctermfg=12
|
||||
hi ModeMsg guibg=bg guifg=#ffeecc gui=none ctermbg=bg ctermfg=14
|
||||
hi link MoreMsg ModeMsg
|
||||
hi Question guibg=bg guifg=#ccffcc gui=bold ctermbg=bg ctermfg=10
|
||||
hi link WarningMsg ErrorMsg
|
||||
|
||||
hi StatusLine guibg=#ffeecc guifg=black gui=bold ctermbg=14 ctermfg=0
|
||||
hi StatusLineNC guibg=#cc4455 guifg=white gui=none ctermbg=4 ctermfg=11
|
||||
hi VertSplit guibg=#cc4455 guifg=white gui=none ctermbg=4 ctermfg=11
|
||||
|
||||
hi DiffAdd guibg=#446688 guifg=fg gui=none ctermbg=1 ctermfg=fg
|
||||
hi DiffChange guibg=#558855 guifg=fg gui=none ctermbg=2 ctermfg=fg
|
||||
hi DiffDelete guibg=#884444 guifg=fg gui=none ctermbg=4 ctermfg=fg
|
||||
hi DiffText guibg=#884444 guifg=fg gui=bold ctermbg=4 ctermfg=fg
|
||||
|
||||
" Colors for Syntax Highlighting.
|
||||
|
||||
hi Comment guibg=#334455 guifg=#dddddd gui=none ctermbg=8 ctermfg=7
|
||||
|
||||
hi Constant guibg=bg guifg=white gui=bold ctermbg=8 ctermfg=15
|
||||
hi String guibg=bg guifg=#ffffcc gui=italic ctermbg=bg ctermfg=14
|
||||
hi Character guibg=bg guifg=#ffffcc gui=bold ctermbg=bg ctermfg=14
|
||||
hi Number guibg=bg guifg=#bbddff gui=bold ctermbg=1 ctermfg=15
|
||||
hi Boolean guibg=bg guifg=#bbddff gui=none ctermbg=1 ctermfg=15
|
||||
hi Float guibg=bg guifg=#bbddff gui=bold ctermbg=1 ctermfg=15
|
||||
|
||||
hi Identifier guibg=bg guifg=#ffddaa gui=bold ctermbg=bg ctermfg=12
|
||||
hi Function guibg=bg guifg=#ffddaa gui=bold ctermbg=bg ctermfg=12
|
||||
hi Statement guibg=bg guifg=#ffffcc gui=bold ctermbg=bg ctermfg=14
|
||||
|
||||
hi Conditional guibg=bg guifg=#ff6666 gui=bold ctermbg=bg ctermfg=12
|
||||
hi Repeat guibg=bg guifg=#ff9900 gui=bold ctermbg=4 ctermfg=14
|
||||
hi Label guibg=bg guifg=#ffccff gui=bold ctermbg=bg ctermfg=13
|
||||
hi Operator guibg=bg guifg=#cc9966 gui=bold ctermbg=6 ctermfg=15
|
||||
hi Keyword guibg=bg guifg=#66ffcc gui=bold ctermbg=bg ctermfg=10
|
||||
hi Exception guibg=bg guifg=#66ffcc gui=bold ctermbg=bg ctermfg=10
|
||||
|
||||
hi PreProc guibg=bg guifg=#ffcc99 gui=bold ctermbg=4 ctermfg=14
|
||||
hi Include guibg=bg guifg=#99cc99 gui=bold ctermbg=bg ctermfg=10
|
||||
hi link Define Include
|
||||
hi link Macro Include
|
||||
hi link PreCondit Include
|
||||
|
||||
hi Type guibg=bg guifg=#ff7788 gui=bold ctermbg=bg ctermfg=12
|
||||
hi StorageClass guibg=bg guifg=#99cc99 gui=bold ctermbg=bg ctermfg=10
|
||||
hi Structure guibg=bg guifg=#99ff99 gui=bold ctermbg=bg ctermfg=10
|
||||
hi Typedef guibg=bg guifg=#99cc99 gui=italic ctermbg=bg ctermfg=10
|
||||
|
||||
hi Special guibg=bg guifg=#bbddff gui=bold ctermbg=1 ctermfg=15
|
||||
hi SpecialChar guibg=bg guifg=#bbddff gui=bold ctermbg=1 ctermfg=15
|
||||
hi Tag guibg=bg guifg=#bbddff gui=bold ctermbg=1 ctermfg=15
|
||||
hi Delimiter guibg=bg guifg=fg gui=bold ctermbg=1 ctermfg=fg
|
||||
hi SpecialComment guibg=#334455 guifg=#dddddd gui=italic ctermbg=1 ctermfg=15
|
||||
hi Debug guibg=bg guifg=#ff9999 gui=none ctermbg=8 ctermfg=12
|
||||
|
||||
hi Underlined guibg=bg guifg=#99ccff gui=underline ctermbg=bg ctermfg=9 cterm=underline
|
||||
|
||||
hi Title guibg=#445566 guifg=white gui=bold ctermbg=1 ctermfg=15
|
||||
hi Ignore guibg=bg guifg=#cccccc gui=italic ctermbg=bg ctermfg=8
|
||||
hi Error guibg=#ff0000 guifg=white gui=bold ctermbg=12 ctermfg=15
|
||||
hi Todo guibg=#556677 guifg=#ff0000 gui=bold ctermbg=1 ctermfg=12
|
||||
|
||||
hi htmlH2 guibg=bg guifg=fg gui=bold ctermbg=8 ctermfg=fg
|
||||
hi link htmlH3 htmlH2
|
||||
hi link htmlH4 htmlH3
|
||||
hi link htmlH5 htmlH4
|
||||
hi link htmlH6 htmlH5
|
||||
|
||||
" And finally.
|
||||
|
||||
let g:colors_name = "Guardian"
|
||||
let colors_name = "Guardian"
|
||||
|
||||
Reference in New Issue
Block a user