Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: yizzreel/vimfiles
base: 8f0b75ca9a
...
head fork: yizzreel/vimfiles
compare: 81bcf6b21a
  • 5 commits
  • 7 files changed
  • 0 commit comments
  • 2 contributors
Commits on Mar 21, 2012
Markus A. Stone More work on watts palette. 3516774
Commits on Mar 22, 2012
Markus A. Stone Improve watts palette.
Add language specific syntax coloring.
7d2bf19
Commits on Mar 30, 2012
Markus A. Stone More work on watts palette. 3c659a9
Commits on Apr 04, 2012
Markus A. Stone More work on Watts theme f4db287
Commits on Oct 11, 2012
Markus A. Stone Add dark version of Watts color scheme. 81bcf6b
4 palettes/.vimrc.local
View
@@ -0,0 +1,4 @@
+" Save, compile palette and set as color scheme
+:nmap <leader>c :w<CR> :!palette watts_pastel.rb > ../vim/colors/watts.vim<CR> :colorscheme watts<CR>
+:nmap <leader>d :w<CR> :!palette watts_dark.rb > ../vim/colors/watts_dark.vim<CR> :colorscheme watts_dark<CR>
+
243 palettes/watts.rb
View
@@ -14,6 +14,13 @@ def swatch(name,color=nil)
@swatches[name.to_sym] = color if color
@swatches[name.to_sym]
end
+
+ def swatches(hash)
+ hash.each do |k,v|
+ swatch k, v
+ end
+ end
+
alias_method :sw, :swatch
def tint(color,weight=50)
@@ -34,64 +41,148 @@ def fade(color,weight=50)
notes "Light pastel theme"
reset true
- background :light
+ background :dark
- swatch :bg, 'FBF7EF'
- swatch :fg, '24231F'
+ # Basic
- swatch :grey, '8A8685'
+ swatch :red, 'D04432' # 'F80326'
+ swatch :blood, 'CF0500'
+ swatch :green, '00C63F'
+ swatch :blue, '314CDE' # '002BEE'
+ swatch :yellow, 'FFF92E'
+ swatch :gold, 'FACE00'
+ swatch :pink, 'D100BD'
- swatch :d_orange, '894204'
- swatch :l_orange, 'F96B01'
+ # Code palette
- swatch :d_green, '0F7C56'
- swatch :l_green, '02BD32'
+ swatches :bg => '211E1A', # '514746',
+ :fg => 'E3DED7', # 'F4F1EF',
+ :comment => '998D7E',
+ :method => '2F93F6',
+ :string => '69C30B', #'649400',
+ :numberic => '8749FF',
+ :keyword => 'C90FFF',
+ :variable => 'D80C57',
+ :symbol => 'F0127C', #'C60F70',
+ :type => '0BC37D', # 'D6331B',
+ :statement => 'D6D07C' #'4F59DC'
- swatch :d_blue, '1321EB'
- swatch :l_blue, '6C95FF'
+ # Vim palette
- swatch :d_mag, '9B1638'
- swatch :l_mag, 'A91F58'
+ swatches :cursor => 'C32481',
+ :search => '07FA00',
+ :msg => '28E883'
- swatch :d_cyan, '1455C0'
- swatch :l_cyan, '4AA8ED'
- swatch :d_turq, '169B79'
- swatch :l_turq, '28E883'
+ # Code definitions
- swatch :d_yellow, 'FCE868'
- swatch :l_yellow, 'FAFE5A'
+ Normal :fg => sw(:fg),
+ :bg => sw(:bg)
- swatch :purple, '461A65'
+ LineNr :fg => shade(:bg,50),
+ :bg => shade(:bg,5),
+ :gui => 'italic'
- swatch :violet, '4E1676'
+ Function :fg => sw(:method),
+ :bg => '2B3036'
- swatch :pink, 'DE2391'
+ Comment :fg => sw(:comment),
+ :bg => 'NONE',
+ :gui => 'italic'
+
+ String :fg => sw(:string),
+ :bg => '30362B',
+ :gui => 'italic'
- swatch :red, 'F80326'
+ Number :fg => sw(:numberic),
+ :bg => '2B2B36'
- Normal :fg => fade(:fg,20),
- :bg => shade(:bg,5)
+ Keyword :fg => sw(:keyword),
+ :bg => '312B36',
+ :gui => 'italic'
- Function :fg => shade(:d_cyan,10)
+ Constant :fg => sw(:keyword),
+ :bg => '312B36'
- Comment :fg => sw(:grey),
- :bg => 'NONE',
+ Identifier :fg => sw(:variable),
+ :bg => '362B2B'
+
+ Special :fg => sw(:symbol),
+ :bg => '362B36',
:gui => 'italic'
- Todo :fg => shade(mix(:red,:fg),80),
+ Typedef :fg => sw(:type),
+ :bg => 'NONE'
+
+ Statement :fg => sw(:statement),
+ :bg => 'NONE'
+
+ Todo :fg => mix(:red,:comment,30),
:bg => 'NONE',
:gui => 'bold,italic'
- LineNr :fg => tint(:fg,60),
- :bg => shade(:bg,8),
+ Delimiter :fg => sw(:blood),
:gui => 'italic'
+ PreProc :fg => sw(:blue)
+
+ StorageClass :fg => sw(:fg),
+ :gui => 'italic'
+
+ type :fg => sw(:type),
+ :bg => '2B3636'
+
+ link :Repeat, :to => :Statement
+
+ link :Operator, :to => :Special
+
+ link :Label, :to => :Identifier
+
+ # Ruby
+
+ link :rubySymbol, :to => :Special
+
+ link :rubyInterpolation, :to => :Normal
+
+ link :rubyStringDelimiter, :to => :String
+
+ link :rubyDefine,
+ :rubyMethodExceptional,
+ :rubyClass,
+ :rubyModule,
+ :to => :Statement
+
+ # Javascript
+
+ link :javaScriptType,
+ :javaScriptNull,
+ :javaScriptThis,
+ :to => :Keyword
+
+ link :javaScriptGlobalObjects, :to => :type
+
+ # CSS
+
+ link :cssSelectorOp, :cssSelectorOp2, :to => :PreProc
+
+ # Git
+
+ gitCommitType :fg => sw(:comment),
+ :gui => 'bold,italic'
+
+ gitCommitFile :fg => sw(:type)
+
+ link :gitcommitSummary, :to => :Title
+ link :gitcommitHeader, :to => :gitcommitType
+ link :gitcommitOverflow, :to => :Error
+
+ # Vim definitions
+
Cursor :fg => sw(:bg),
- :bg => shade(:pink,20)
+ :bg => sw(:cursor)
CursorLine :fg => 'NONE',
- :bg => 'FFF'
+ :bg => shade(:bg,5)
StatusLine :fg => sw(:bg),
:bg => fade(:fg,30),
@@ -104,109 +195,77 @@ def fade(color,weight=50)
VertSplit :fg => fade(:fg,30),
:bg => fade(:fg,30)
- String :fg => sw(:d_turq),
- :bg => 'NONE',
- :gui => 'italic'
+ Visual :bg => fade(:yellow,20)
- Number :fg => shade(:red,20),
- :bg => 'NONE'
+ VisualNOS :bg => fade(:yellow,40)
- Constant :fg => shade(:l_turq,30),
- :bg => 'NONE',
+ IncSearch :fg => sw(:fg),
+ :bg => sw(:search),
:gui => 'bold'
- Identifier :fg => shade(:pink,20),
- :bg => 'NONE',
- :gui => 'italic'
-
- Special :fg => sw(:d_cyan),
- :bg => 'NONE',
- :gui => 'italic'
-
- type :fg => shade(:l_orange,20),
- :bg => 'NONE'
+ Search :fg => sw(:fg),
+ :bg => fade(:search),
+ :gui => 'bold'
- Statement :fg => mix(fade(:d_cyan,40),:violet),
- :bg => 'NONE',
- :gui => 'italic'
+ NonText :fg => fade(:fg),
+ :bg => fade(:fg,95),
+ :gui => 'bold'
Error :fg => sw(:bg),
:bg => sw(:red),
:gui => 'bold'
WarningMsg :fg => sw(:bg),
- :bg => sw(:l_orange),
- :gui => 'bold'
-
- Visual :bg => sw(:d_yellow)
-
- VisualNOS :bg => sw(:l_yellow)
-
- IncSearch :fg => sw(:bg),
- :bg => sw(:d_cyan),
- :gui => 'bold'
-
- Search :fg => sw(:bg),
- :bg => sw(:l_cyan),
- :gui => 'bold'
-
- NonText :fg => fade(:fg),
- :bg => fade(:fg,95),
+ :bg => sw(:red),
:gui => 'bold'
- SpecialKey :fg => sw(:pink),
- :bg => sw(:l_yellow)
-
- Directory :fg => sw(:l_blue)
+ Directory :fg => sw(:blue)
- DiffAdd :fg => sw(:d_green),
- :bg => fade(:d_green,90)
+ DiffAdd :fg => sw(:green),
+ :bg => fade(:green,90)
DiffChange :fg => sw(:fg),
- :bg => fade(:d_yellow)
+ :bg => fade(:yellow)
DiffDelete :fg => sw(:red),
:bg => fade(:red,90)
DiffText :fg => tint(:fg,30),
- :bg => fade(:d_yellow,90)
+ :bg => fade(:yellow,90)
Pmenu :fg => shade('FFF',70),
:bg => shade('FFF',12)
PmenuSel :fg => sw(:fg),
- :bg => sw(:d_yellow),
+ :bg => sw(:yellow),
:gui => 'bold'
PmenuThumb :fg => sw(:bg),
:bg => fade(:fg,10)
WildMenu :fg => sw(:fg),
- :bg => sw(:l_yellow),
+ :bg => sw(:yellow),
:gui => 'italic'
- MatchParen :fg => sw(:bg),
- :bg => fade(sw(:pink),30)
+ MatchParen :fg => sw(:fg),
+ :bg => sw(:gold)
- MoreMsg :fg => sw(:l_turq),
- :bg => sw(:bg),
+ MoreMsg :fg => sw(:fg),
+ :bg => sw(:msg),
:gui => 'bold'
- Question :fg => sw(:d_turq),
+ Question :fg => sw(:msg),
:bg => 'NONE',
:gui => 'bold'
ModeMsg :fg => sw(:fg),
- :bg => fade(:l_turq)
+ :bg => fade(:msg)
+
+ Title :fg => sw(:fg),
+ :gui => 'bold'
+ PreProc :fg => sw(:blue)
- link :Delimiter, :rubyInterpolation, :to => :String
- link :rubySymbol, :to => :Special
- link :rubyDefine, :rubyMethodExceptional, :rubyClass, :rubyModule, :to => :Statement
- link :Typedef, :rubyConstant, :to => :type
link :ErrorMsg, :to => :Error
link :PmenuSbar, :to => :PmenuSel
- # link :vimComment, :vimCommentString, :vimCommentTitle, :to => :Comment
- # link :rubyFunction, :to => :Function
- # link :vimFold, :FoldColumn, :to => :Folded
end
245 palettes/watts_dark.rb
View
@@ -0,0 +1,245 @@
+Palette::ColorScheme.class_eval do
+ def mix(hex_a,hex_b,weight=50)
+ color1, color2 = hex_a, hex_b
+ color1 = swatch(hex_a) if hex_a.is_a?(Symbol) && swatch(hex_a)
+ color2 = swatch(hex_b) if hex_b.is_a?(Symbol) && swatch(hex_b)
+ sass_evaluator(:mix, hex_to_sass_color(color1), hex_to_sass_color(color2), Sass::Script::Number.new(weight))
+ end
+
+ # TODO: This is a todo
+ # Cool!!
+ #
+ def swatch(name,color=nil)
+ @swatches ||= Hash.new
+ @swatches[name.to_sym] = color if color
+ @swatches[name.to_sym]
+ end
+
+ def swatches(hash)
+ hash.each do |k,v|
+ swatch k, v
+ end
+ end
+
+ alias_method :sw, :swatch
+
+ def tint(color,weight=50)
+ mix('FFF',color,weight)
+ end
+
+ def shade(color,weight=50)
+ mix(sw(:fg) || '000',color,weight)
+ end
+
+ def fade(color,weight=50)
+ mix(sw(:bg) || 'FFF',color,weight)
+ end
+end
+
+vim_colors "watts_dark" do
+ author "Marcos A."
+ notes "Light pastel theme"
+
+ reset true
+ background :dark
+
+ # Basic
+
+ swatch :red, 'D04432' # 'F80326'
+ swatch :blood, 'CF0500'
+ swatch :green, '00C63F'
+ swatch :blue, '314CDE' # '002BEE'
+ swatch :yellow, 'FFF455'
+ swatch :gold, 'FACE00'
+ swatch :pink, 'D100BD'
+ swatch :crimson, '540009'
+
+ # Code palette
+
+ swatches :bg => '211E1A', # '514746',
+ :fg => 'E3DED7', # 'F4F1EF',
+ :comment => '998D7E',
+ :method => '2F93F6',
+ :string => '69C30B', #'649400',
+ :numeric => '8749FF',
+ :keyword => 'C90FFF',
+ :variable => 'D80C57',
+ :symbol => 'F0127C', #'C60F70',
+ :type => '0BC37D', # 'D6331B',
+ :statement => 'D6D07C' #'4F59DC'
+
+ # Vim palette
+
+ swatches :cursor => 'C32481',
+ :search => '5458F5',
+ :msg => '28E883'
+
+
+ # Code definitions
+
+ Normal :fg => sw(:fg),
+ :bg => sw(:bg)
+
+ LineNr :fg => shade(:bg,50),
+ :bg => shade(:bg,5)
+
+ Function :fg => sw(:method),
+ :bg => '2B3036'
+
+ Comment :fg => sw(:comment),
+ :bg => 'NONE'
+
+ String :fg => sw(:string),
+ :bg => '30362B'
+
+ Number :fg => sw(:numeric),
+ :bg => '2B2B36'
+
+ Keyword :fg => sw(:keyword),
+ :bg => '312B36'
+
+ Constant :fg => sw(:keyword),
+ :bg => '312B36'
+
+ Identifier :fg => sw(:variable),
+ :bg => '362B2B'
+
+ Special :fg => sw(:symbol),
+ :bg => '362B36'
+
+ Typedef :fg => sw(:type),
+ :bg => 'NONE'
+
+ Statement :fg => sw(:statement),
+ :bg => 'NONE'
+
+ Todo :fg => mix(:red,:comment,30),
+ :bg => 'NONE'
+
+ Delimiter :fg => sw(:blood)
+
+ PreProc :fg => sw(:blue)
+
+ StorageClass :fg => sw(:fg)
+
+ type :fg => sw(:type),
+ :bg => '2B3636'
+
+ link :Repeat, :to => :Statement
+
+ link :Operator, :to => :Special
+
+ link :Label, :to => :Identifier
+
+ # Ruby
+
+ link :rubySymbol, :to => :Special
+
+ link :rubyInterpolation, :to => :Normal
+
+ link :rubyStringDelimiter, :to => :String
+
+ link :rubyDefine,
+ :rubyMethodExceptional,
+ :rubyClass,
+ :rubyModule,
+ :to => :Statement
+
+ # Javascript
+
+ link :javaScriptType,
+ :javaScriptNull,
+ :javaScriptThis,
+ :to => :Keyword
+
+ link :javaScriptGlobalObjects, :to => :type
+
+ # CSS
+
+ link :cssSelectorOp, :cssSelectorOp2, :to => :PreProc
+
+ # Git
+
+ gitCommitType :fg => sw(:comment),
+ :gui => 'bold,italic'
+
+ gitCommitFile :fg => sw(:type)
+
+ link :gitcommitSummary, :to => :Title
+ link :gitcommitHeader, :to => :gitcommitType
+ link :gitcommitOverflow, :to => :Error
+
+ # Vim definitions
+
+ Cursor :bg => sw(:cursor)
+
+ CursorLine :fg => 'NONE',
+ :bg => shade(:bg,5)
+
+ StatusLine :fg => sw(:bg),
+ :bg => fade(:fg,30)
+
+ StatusLineNC :fg => sw(:bg),
+ :bg => fade(:fg,50)
+
+ VertSplit :fg => fade(:fg,30),
+ :bg => fade(:fg,30)
+
+ Visual :bg => fade(:yellow,80)
+
+ VisualNOS :bg => fade(:yellow,70)
+
+ IncSearch :bg => sw(:search)
+
+ Search :bg => fade(:search,20)
+
+ NonText :fg => fade(:fg),
+ :bg => fade(:fg,95)
+
+ Error :bg => sw(:red)
+
+ WarningMsg :fg => sw(:bg),
+ :bg => sw(:red)
+
+ Directory :fg => sw(:blue)
+
+ DiffAdd :fg => sw(:green),
+ :bg => fade(:green,90)
+
+ DiffChange :fg => sw(:fg),
+ :bg => fade(:yellow)
+
+ DiffDelete :fg => sw(:red),
+ :bg => fade(:red,90)
+
+ DiffText :fg => tint(:fg,30),
+ :bg => fade(:yellow,90)
+
+ Pmenu :fg => sw(:bg),
+ :bg => tint(:bg,65)
+
+ PmenuSel :bg => 'FFF455'
+
+ MatchParen :fg => sw(:fg),
+ :bg => sw(:gold)
+
+ MoreMsg :fg => sw(:fg),
+ :bg => sw(:msg),
+ :gui => 'bold'
+
+ Question :fg => sw(:msg),
+ :bg => 'NONE',
+ :gui => 'bold'
+
+ ModeMsg :fg => sw(:fg),
+ :bg => fade(:msg)
+
+ Title :fg => sw(:fg)
+
+ PreProc :fg => sw(:blue)
+
+ SpellBad :bg => sw(:crimson)
+
+ link :ErrorMsg, :to => :Error
+ link :PmenuSbar, :to => :PmenuSel
+end
267 palettes/watts_pastel.rb
View
@@ -0,0 +1,267 @@
+Palette::ColorScheme.class_eval do
+ def mix(hex_a,hex_b,weight=50)
+ color1, color2 = hex_a, hex_b
+ color1 = swatch(hex_a) if hex_a.is_a?(Symbol) && swatch(hex_a)
+ color2 = swatch(hex_b) if hex_b.is_a?(Symbol) && swatch(hex_b)
+ sass_evaluator(:mix, hex_to_sass_color(color1), hex_to_sass_color(color2), Sass::Script::Number.new(weight))
+ end
+
+ # TODO: This is a todo
+ # Cool!!
+ #
+ def swatch(name,color=nil)
+ @swatches ||= Hash.new
+ @swatches[name.to_sym] = color if color
+ @swatches[name.to_sym]
+ end
+
+ def swatches(hash)
+ hash.each do |k,v|
+ swatch k, v
+ end
+ end
+
+ alias_method :sw, :swatch
+
+ def tint(color,weight=50)
+ mix('FFF',color,weight)
+ end
+
+ def shade(color,weight=50)
+ mix(sw(:fg) || '000',color,weight)
+ end
+
+ def fade(color,weight=50)
+ mix(sw(:bg) || 'FFF',color,weight)
+ end
+end
+
+vim_colors "watts" do
+ author "Marcos A."
+ notes "Light pastel theme"
+
+ reset true
+ background :light
+
+ # Basic
+
+ swatch :red, 'D04432' # 'F80326'
+ swatch :blood, 'CF0500'
+ swatch :green, '00C63F'
+ swatch :blue, '314CDE' # '002BEE'
+ swatch :yellow, 'FFF92E'
+ swatch :gold, 'FACE00'
+ swatch :pink, 'D100BD'
+
+ # Code palette
+
+ swatches :fg => '5A5957', # '514746',
+ :bg => 'EAE9E7', # 'F4F1EF',
+ :method => '4375A3',
+ :string => '60A345', #'649400',
+ :keyword => '825196',
+ :numeric => '5F5196',
+ :variable => 'BB435B',
+ :symbol => 'C34E8D', #'C60F70',
+ :type => '45A388', # 'D6331B',
+ :statement => '5996A6' #'4F59DC'
+
+ # Vim palette
+
+ swatches :cursor => 'C32481',
+ :search => '07FA00',
+ :msg => '28E883'
+
+
+ # Code definitions
+
+ Normal :fg => sw(:fg),
+ :bg => sw(:bg)
+
+ LineNr :fg => tint(:fg,50),
+ :bg => shade(:bg,5),
+ :gui => 'italic'
+
+ Function :fg => sw(:method)
+
+ Comment :fg => fade(:fg),
+ :bg => 'NONE',
+ :gui => 'italic'
+
+ String :fg => sw(:string),
+ :gui => 'italic'
+
+ Number :fg => sw(:numeric),
+ :bg => 'NONE'
+
+ Keyword :fg => sw(:keyword),
+ :gui => 'italic'
+
+ Constant :fg => sw(:keyword),
+ :bg => 'NONE'
+
+ Identifier :fg => sw(:variable),
+ :bg => 'NONE'
+
+ Special :fg => sw(:symbol),
+ :bg => 'NONE',
+ :gui => 'italic'
+
+ Typedef :fg => sw(:type),
+ :bg => 'NONE'
+
+ Statement :fg => sw(:statement),
+ :bg => 'NONE'
+
+ Todo :fg => fade(:fg),
+ :bg => fade(:yellow),
+ :gui => 'bold,italic'
+
+ Delimiter :fg => sw(:blood),
+ :gui => 'italic'
+
+ PreProc :fg => sw(:blue)
+
+ StorageClass :fg => sw(:fg),
+ :gui => 'italic'
+
+ type :fg => sw(:type),
+ :bg => 'NONE'
+
+ link :Repeat, :to => :Statement
+
+ link :Operator, :to => :Special
+
+ link :Label, :to => :Identifier
+
+ # Ruby
+
+ link :rubySymbol, :to => :Special
+
+ link :rubyInterpolation, :to => :Normal
+
+ link :rubyStringDelimiter, :to => :String
+
+ link :rubyDefine,
+ :rubyMethodExceptional,
+ :rubyClass,
+ :rubyModule,
+ :to => :Statement
+
+ # Javascript
+
+ link :javaScriptType,
+ :javaScriptNull,
+ :javaScriptThis,
+ :to => :Keyword
+
+ link :javaScriptGlobalObjects, :to => :type
+
+ # CSS
+
+ link :cssSelectorOp, :cssSelectorOp2, :to => :PreProc
+
+ # Git
+
+ gitCommitType :fg => fade(:fg),
+ :gui => 'bold,italic'
+
+ gitCommitFile :fg => sw(:type)
+
+ link :gitcommitSummary, :to => :Title
+ link :gitcommitHeader, :to => :gitcommitType
+ link :gitcommitOverflow, :to => :Error
+
+ # Vim definitions
+
+ Cursor :fg => sw(:bg),
+ :bg => sw(:cursor)
+
+ CursorLine :fg => 'NONE',
+ :bg => shade(:bg,5)
+
+ StatusLine :fg => sw(:bg),
+ :bg => fade(:fg,30),
+ :gui => 'italic'
+
+ StatusLineNC :fg => sw(:bg),
+ :bg => fade(:fg,50),
+ :gui => 'italic'
+
+ VertSplit :fg => fade(:fg,30),
+ :bg => fade(:fg,30)
+
+ Visual :bg => fade(:yellow,20)
+
+ VisualNOS :bg => fade(:yellow,40)
+
+ IncSearch :fg => sw(:fg),
+ :bg => sw(:search),
+ :gui => 'bold'
+
+ Search :fg => sw(:fg),
+ :bg => fade(:search),
+ :gui => 'bold'
+
+ NonText :fg => fade(:fg),
+ :bg => fade(:fg,95),
+ :gui => 'bold'
+
+ Error :fg => sw(:bg),
+ :bg => sw(:red),
+ :gui => 'bold'
+
+ WarningMsg :fg => sw(:bg),
+ :bg => sw(:red),
+ :gui => 'bold'
+
+ Directory :fg => sw(:blue)
+
+ DiffAdd :fg => sw(:green),
+ :bg => fade(:green,90)
+
+ DiffChange :fg => sw(:fg),
+ :bg => fade(:yellow)
+
+ DiffDelete :fg => sw(:red),
+ :bg => fade(:red,90)
+
+ DiffText :fg => tint(:fg,30),
+ :bg => fade(:yellow,90)
+
+ Pmenu :fg => shade('FFF',70),
+ :bg => shade('FFF',12)
+
+ PmenuSel :fg => sw(:fg),
+ :bg => sw(:yellow),
+ :gui => 'bold'
+
+ PmenuThumb :fg => sw(:bg),
+ :bg => fade(:fg,10)
+
+ WildMenu :fg => sw(:fg),
+ :bg => sw(:yellow),
+ :gui => 'italic'
+
+ MatchParen :fg => sw(:fg),
+ :bg => sw(:gold)
+
+ MoreMsg :fg => sw(:fg),
+ :bg => sw(:msg),
+ :gui => 'bold'
+
+ Question :fg => sw(:msg),
+ :bg => 'NONE',
+ :gui => 'bold'
+
+ ModeMsg :fg => sw(:fg),
+ :bg => fade(:msg)
+
+ Title :fg => sw(:fg),
+ :gui => 'bold'
+
+ PreProc :fg => sw(:blue)
+
+ link :ErrorMsg, :to => :Error
+ link :PmenuSbar, :to => :PmenuSel
+end
272 palettes/watts_vivid.rb
View
@@ -0,0 +1,272 @@
+Palette::ColorScheme.class_eval do
+ def mix(hex_a,hex_b,weight=50)
+ color1, color2 = hex_a, hex_b
+ color1 = swatch(hex_a) if hex_a.is_a?(Symbol) && swatch(hex_a)
+ color2 = swatch(hex_b) if hex_b.is_a?(Symbol) && swatch(hex_b)
+ sass_evaluator(:mix, hex_to_sass_color(color1), hex_to_sass_color(color2), Sass::Script::Number.new(weight))
+ end
+
+ # TODO: This is a todo for testing the color scheme
+ #
+ #
+ def swatch(name,color=nil)
+ @swatches ||= Hash.new
+ @swatches[name.to_sym] = color if color
+ @swatches[name.to_sym]
+ end
+
+ def swatches(hash)
+ hash.each do |k,v|
+ swatch k, v
+ end
+ end
+
+ alias_method :sw, :swatch
+
+ def tint(color,weight=50)
+ mix('FFF',color,weight)
+ end
+
+ def shade(color,weight=50)
+ mix(sw(:fg) || '000',color,weight)
+ end
+
+ def fade(color,weight=50)
+ mix(sw(:bg) || 'FFF',color,weight)
+ end
+end
+
+vim_colors "watts" do
+ author "Markus A. Stone"
+ notes "Light pastel theme"
+
+ reset true
+ background :light
+
+ # Basic
+
+ swatch :red, 'D04432' # 'F80326'
+ swatch :blood, 'CF0500'
+ swatch :green, '00C63F'
+ swatch :blue, '314CDE' # '002BEE'
+ swatch :yellow, 'FFF92E'
+ swatch :gold, 'FACE00'
+ swatch :pink, 'D100BD'
+
+ # Code palette
+
+ swatches :fg => '5E554A', # '514746',
+ :bg => 'DED8D2', # 'F4F1EF',
+ :comment => '998D7E',
+ :method => '1664AE',
+ :string => '5CAB0A', #'649400',
+ :numberic => '410AAB',
+ :keyword => '920AAB',
+ :variable => 'D80C57',
+ :symbol => 'C90B79', #'C60F70',
+ :type => '09A16B', # 'D6331B',
+ :statement => 'E0D7C1' #'4F59DC'
+
+ # Vim palette
+
+ swatches :cursor => 'C32481',
+ :search => '07FA00',
+ :msg => '28E883'
+
+
+ # Code definitions
+
+ Normal :fg => sw(:fg),
+ :bg => sw(:bg)
+
+ LineNr :fg => tint(:fg,50),
+ :bg => shade(:bg,5),
+ :gui => 'italic'
+
+ Function :fg => sw(:method),
+ :bg => 'D2D7DE'
+
+ Comment :fg => sw(:comment),
+ :bg => 'NONE',
+ :gui => 'italic'
+
+ String :fg => sw(:string),
+ :bg => 'D7DED2',
+ :gui => 'italic'
+
+ Number :fg => sw(:numberic),
+ :bg => 'D2D2DE'
+
+ Keyword :fg => sw(:keyword),
+ :bg => 'D8D2DE',
+ :gui => 'italic'
+
+ Constant :fg => sw(:keyword),
+ :bg => 'D8D2DE'
+
+ Identifier :fg => sw(:variable),
+ :bg => 'DED2D2'
+
+ Special :fg => sw(:symbol),
+ :bg => 'DED2D7',
+ :gui => 'italic'
+
+ Typedef :fg => sw(:type),
+ :bg => 'NONE'
+
+ Statement :bg => sw(:statement),
+ :fg => '6C554A',
+ :gui => 'italic'
+
+ Todo :fg => mix(:red,:comment,30),
+ :bg => 'NONE',
+ :gui => 'bold,italic'
+
+ Delimiter :fg => sw(:blood),
+ :gui => 'italic'
+
+ PreProc :fg => sw(:blue)
+
+ StorageClass :fg => sw(:fg),
+ :gui => 'italic'
+
+ type :fg => sw(:type),
+ :bg => 'D2DED8'
+
+ link :Repeat, :to => :Statement
+
+ link :Operator, :to => :Special
+
+ link :Label, :to => :Identifier
+
+ # Ruby
+
+ link :rubySymbol, :to => :Special
+
+ link :rubyInterpolation, :to => :Normal
+
+ link :rubyStringDelimiter, :to => :String
+
+ link :rubyDefine,
+ :rubyMethodExceptional,
+ :rubyClass,
+ :rubyModule,
+ :to => :Statement
+
+ # Javascript
+
+ link :javaScriptType,
+ :javaScriptNull,
+ :javaScriptThis,
+ :to => :Keyword
+
+ link :javaScriptGlobalObjects, :to => :type
+
+ # CSS
+
+ link :cssSelectorOp, :cssSelectorOp2, :to => :PreProc
+
+ # Git
+
+ gitCommitType :fg => sw(:comment),
+ :gui => 'bold,italic'
+
+ gitCommitFile :fg => sw(:type)
+
+ link :gitcommitSummary, :to => :Title
+ link :gitcommitHeader, :to => :gitcommitType
+ link :gitcommitOverflow, :to => :Error
+
+ # Vim definitions
+
+ Cursor :fg => sw(:bg),
+ :bg => sw(:cursor)
+
+ CursorLine :fg => 'NONE',
+ :bg => shade(:bg,5)
+
+ StatusLine :fg => sw(:bg),
+ :bg => fade(:fg,30),
+ :gui => 'italic'
+
+ StatusLineNC :fg => sw(:bg),
+ :bg => fade(:fg,50),
+ :gui => 'italic'
+
+ VertSplit :fg => fade(:fg,30),
+ :bg => fade(:fg,30)
+
+ Visual :bg => fade(:yellow,20)
+
+ VisualNOS :bg => fade(:yellow,40)
+
+ IncSearch :fg => sw(:fg),
+ :bg => sw(:search),
+ :gui => 'bold'
+
+ Search :fg => sw(:fg),
+ :bg => fade(:search),
+ :gui => 'bold'
+
+ NonText :fg => fade(:fg),
+ :bg => fade(:fg,95),
+ :gui => 'bold'
+
+ Error :fg => sw(:bg),
+ :bg => sw(:red),
+ :gui => 'bold'
+
+ WarningMsg :fg => sw(:bg),
+ :bg => sw(:red),
+ :gui => 'bold'
+
+ Directory :fg => sw(:blue)
+
+ DiffAdd :fg => sw(:green),
+ :bg => fade(:green,90)
+
+ DiffChange :fg => sw(:fg),
+ :bg => fade(:yellow)
+
+ DiffDelete :fg => sw(:red),
+ :bg => fade(:red,90)
+
+ DiffText :fg => tint(:fg,30),
+ :bg => fade(:yellow,90)
+
+ Pmenu :fg => shade('FFF',70),
+ :bg => shade('FFF',12)
+
+ PmenuSel :fg => sw(:fg),
+ :bg => sw(:yellow),
+ :gui => 'bold'
+
+ PmenuThumb :fg => sw(:bg),
+ :bg => fade(:fg,10)
+
+ WildMenu :fg => sw(:fg),
+ :bg => sw(:yellow),
+ :gui => 'italic'
+
+ MatchParen :fg => sw(:fg),
+ :bg => sw(:gold)
+
+ MoreMsg :fg => sw(:fg),
+ :bg => sw(:msg),
+ :gui => 'bold'
+
+ Question :fg => sw(:msg),
+ :bg => 'NONE',
+ :gui => 'bold'
+
+ ModeMsg :fg => sw(:fg),
+ :bg => fade(:msg)
+
+ Title :fg => sw(:fg),
+ :gui => 'bold'
+
+ PreProc :fg => sw(:blue)
+
+ link :ErrorMsg, :to => :Error
+ link :PmenuSbar, :to => :PmenuSel
+end
116 vim/colors/watts.vim
View
@@ -18,53 +18,71 @@ if has("gui_running")
set background=light
endif
-hi Normal guifg=#4F4D48 ctermfg=239 guibg=#F0ECE4 ctermbg=255 gui=NONE cterm=NONE
-hi Function guifg=#1550AF ctermfg=25 gui=NONE cterm=NONE
-hi Comment guifg=#8A8685 ctermfg=102 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
-hi Todo guifg=#391F1F ctermfg=235 guibg=NONE ctermbg=NONE gui=BOLD,ITALIC cterm=NONE
-hi LineNr guifg=#A7A7A5 ctermfg=248 guibg=#E9E6DE ctermbg=254 gui=ITALIC cterm=NONE
-hi Cursor guifg=#FBF7EF ctermfg=255 guibg=#B8237A ctermbg=126 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE ctermfg=NONE guibg=#FFFFFF ctermbg=231 gui=NONE cterm=NONE
-hi StatusLine guifg=#FBF7EF ctermfg=255 guibg=#64625D ctermbg=241 gui=ITALIC cterm=NONE
-hi StatusLineNC guifg=#FBF7EF ctermfg=255 guibg=#8F8D87 ctermbg=245 gui=ITALIC cterm=NONE
-hi VertSplit guifg=#64625D ctermfg=241 guibg=#64625D ctermbg=241 gui=NONE cterm=NONE
-hi String guifg=#169B79 ctermfg=30 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
-hi Number guifg=#CD0924 ctermfg=160 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#26AC64 ctermfg=35 guibg=NONE ctermbg=NONE gui=BOLD cterm=BOLD
-hi Identifier guifg=#B8237A ctermfg=126 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
-hi Special guifg=#1455C0 ctermfg=25 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
-hi type guifg=#CE5C07 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#5F55A4 ctermfg=61 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
-hi Error guifg=#FBF7EF ctermfg=255 guibg=#F80326 ctermbg=196 gui=BOLD cterm=BOLD
-hi WarningMsg guifg=#FBF7EF ctermfg=255 guibg=#F96B01 ctermbg=202 gui=BOLD cterm=BOLD
-hi Visual guibg=#FCE868 ctermbg=221 gui=NONE cterm=NONE
-hi VisualNOS guibg=#FAFE5A ctermbg=227 gui=NONE cterm=NONE
-hi IncSearch guifg=#FBF7EF ctermfg=255 guibg=#1455C0 ctermbg=25 gui=BOLD cterm=BOLD
-hi Search guifg=#FBF7EF ctermfg=255 guibg=#4AA8ED ctermbg=75 gui=BOLD cterm=BOLD
-hi NonText guifg=#8F8D87 ctermfg=245 guibg=#F0ECE4 ctermbg=255 gui=BOLD cterm=BOLD
-hi SpecialKey guifg=#DE2391 ctermfg=162 guibg=#FAFE5A ctermbg=227 gui=NONE cterm=NONE
-hi Directory guifg=#6C95FF ctermfg=69 gui=NONE cterm=NONE
-hi DiffAdd guifg=#0F7C56 ctermfg=29 guibg=#E3EADF ctermbg=254 gui=NONE cterm=NONE
-hi DiffChange guifg=#24231F ctermfg=235 guibg=#FBEFAB ctermbg=229 gui=NONE cterm=NONE
-hi DiffDelete guifg=#F80326 ctermfg=196 guibg=#FADEDA ctermbg=224 gui=NONE cterm=NONE
-hi DiffText guifg=#656562 ctermfg=241 guibg=#FBF5E1 ctermbg=230 gui=NONE cterm=NONE
-hi Pmenu guifg=#656562 ctermfg=241 guibg=#E4E4E4 ctermbg=254 gui=NONE cterm=NONE
-hi PmenuSel guifg=#24231F ctermfg=235 guibg=#FCE868 ctermbg=221 gui=BOLD cterm=BOLD
-hi PmenuThumb guifg=#FBF7EF ctermfg=255 guibg=#393833 ctermbg=237 gui=NONE cterm=NONE
-hi WildMenu guifg=#24231F ctermfg=235 guibg=#FAFE5A ctermbg=227 gui=ITALIC cterm=NONE
-hi MatchParen guifg=#FBF7EF ctermfg=255 guibg=#E662AD ctermbg=169 gui=NONE cterm=NONE
-hi MoreMsg guifg=#28E883 ctermfg=42 guibg=#FBF7EF ctermbg=255 gui=BOLD cterm=BOLD
-hi Question guifg=#169B79 ctermfg=30 guibg=NONE ctermbg=NONE gui=BOLD cterm=BOLD
-hi ModeMsg guifg=#24231F ctermfg=235 guibg=#91EFB9 ctermbg=121 gui=NONE cterm=NONE
+hi Normal guifg=#5A5957 ctermfg=240 guibg=#EAE9E7 ctermbg=254 gui=NONE cterm=NONE
+hi LineNr guifg=#ACACAB ctermfg=145 guibg=#E2E1DF ctermbg=254 gui=ITALIC cterm=NONE
+hi Function guifg=#4375A3 ctermfg=67 gui=NONE cterm=NONE
+hi Comment guifg=#A2A19F ctermfg=247 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
+hi String guifg=#60A345 ctermfg=71 gui=ITALIC cterm=NONE
+hi Number guifg=#5F5196 ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi Keyword guifg=#825196 ctermfg=96 gui=ITALIC cterm=NONE
+hi Constant guifg=#825196 ctermfg=96 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi Identifier guifg=#BB435B ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi Special guifg=#C34E8D ctermfg=132 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
+hi Typedef guifg=#45A388 ctermfg=72 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi Statement guifg=#5996A6 ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi Todo guifg=#A2A19F ctermfg=247 guibg=#F4F18A ctermbg=228 gui=BOLD,ITALIC cterm=NONE
+hi Delimiter guifg=#CF0500 ctermfg=160 gui=ITALIC cterm=NONE
+hi PreProc guifg=#314CDE ctermfg=62 gui=NONE cterm=NONE
+hi StorageClass guifg=#5A5957 ctermfg=240 gui=ITALIC cterm=NONE
+hi type guifg=#45A388 ctermfg=72 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi gitCommitType guifg=#A2A19F ctermfg=247 gui=BOLD,ITALIC cterm=NONE
+hi gitCommitFile guifg=#45A388 ctermfg=72 gui=NONE cterm=NONE
+hi Cursor guifg=#EAE9E7 ctermfg=254 guibg=#C32481 ctermbg=126 gui=NONE cterm=NONE
+hi CursorLine guifg=NONE ctermfg=NONE guibg=#E2E1DF ctermbg=254 gui=NONE cterm=NONE
+hi StatusLine guifg=#EAE9E7 ctermfg=254 guibg=#858482 ctermbg=102 gui=ITALIC cterm=NONE
+hi StatusLineNC guifg=#EAE9E7 ctermfg=254 guibg=#A2A19F ctermbg=247 gui=ITALIC cterm=NONE
+hi VertSplit guifg=#858482 ctermfg=102 guibg=#858482 ctermbg=102 gui=NONE cterm=NONE
+hi Visual guibg=#FAF553 ctermbg=227 gui=NONE cterm=NONE
+hi VisualNOS guibg=#F6F278 ctermbg=228 gui=NONE cterm=NONE
+hi IncSearch guifg=#5A5957 ctermfg=240 guibg=#07FA00 ctermbg=46 gui=BOLD cterm=BOLD
+hi Search guifg=#5A5957 ctermfg=240 guibg=#78F173 ctermbg=119 gui=BOLD cterm=BOLD
+hi NonText guifg=#A2A19F ctermfg=247 guibg=#E2E1DF ctermbg=254 gui=BOLD cterm=BOLD
+hi Error guifg=#EAE9E7 ctermfg=254 guibg=#D04432 ctermbg=167 gui=BOLD cterm=BOLD
+hi WarningMsg guifg=#EAE9E7 ctermfg=254 guibg=#D04432 ctermbg=167 gui=BOLD cterm=BOLD
+hi Directory guifg=#314CDE ctermfg=62 gui=NONE cterm=NONE
+hi DiffAdd guifg=#00C63F ctermfg=41 guibg=#D2E5D6 ctermbg=188 gui=NONE cterm=NONE
+hi DiffChange guifg=#5A5957 ctermfg=240 guibg=#F4F18A ctermbg=228 gui=NONE cterm=NONE
+hi DiffDelete guifg=#D04432 ctermfg=167 guibg=#E7D8D4 ctermbg=188 gui=NONE cterm=NONE
+hi DiffText guifg=#8B8A89 ctermfg=245 guibg=#ECEAD4 ctermbg=254 gui=NONE cterm=NONE
+hi Pmenu guifg=#8B8A89 ctermfg=245 guibg=#EBEBEA ctermbg=255 gui=NONE cterm=NONE
+hi PmenuSel guifg=#5A5957 ctermfg=240 guibg=#FFF92E ctermbg=226 gui=BOLD cterm=BOLD
+hi PmenuThumb guifg=#EAE9E7 ctermfg=254 guibg=#686765 ctermbg=241 gui=NONE cterm=NONE
+hi WildMenu guifg=#5A5957 ctermfg=240 guibg=#FFF92E ctermbg=226 gui=ITALIC cterm=NONE
+hi MatchParen guifg=#5A5957 ctermfg=240 guibg=#FACE00 ctermbg=220 gui=NONE cterm=NONE
+hi MoreMsg guifg=#5A5957 ctermfg=240 guibg=#28E883 ctermbg=42 gui=BOLD cterm=BOLD
+hi Question guifg=#28E883 ctermfg=42 guibg=NONE ctermbg=NONE gui=BOLD cterm=BOLD
+hi ModeMsg guifg=#5A5957 ctermfg=240 guibg=#89E8B5 ctermbg=115 gui=NONE cterm=NONE
+hi Title guifg=#5A5957 ctermfg=240 gui=BOLD cterm=BOLD
+hi PreProc guifg=#314CDE ctermfg=62 gui=NONE cterm=NONE
-hi link Delimiter String
-hi link rubyInterpolation String
-hi link rubySymbol Special
-hi link rubyDefine Statement
-hi link rubyMethodExceptional Statement
-hi link rubyClass Statement
-hi link rubyModule Statement
-hi link Typedef type
-hi link rubyConstant type
-hi link ErrorMsg Error
-hi link PmenuSbar PmenuSel
+hi link Repeat Statement
+hi link Operator Special
+hi link Label Identifier
+hi link rubySymbol Special
+hi link rubyInterpolation Normal
+hi link rubyStringDelimiter String
+hi link rubyDefine Statement
+hi link rubyMethodExceptional Statement
+hi link rubyClass Statement
+hi link rubyModule Statement
+hi link javaScriptType Keyword
+hi link javaScriptNull Keyword
+hi link javaScriptThis Keyword
+hi link javaScriptGlobalObjects type
+hi link cssSelectorOp PreProc
+hi link cssSelectorOp2 PreProc
+hi link gitcommitSummary Title
+hi link gitcommitHeader gitcommitType
+hi link gitcommitOverflow Error
+hi link ErrorMsg Error
+hi link PmenuSbar PmenuSel
27 vimrc
View
@@ -22,11 +22,22 @@ set ts=2 sts=2 sw=2 " Tab width in spaces
set expandtab " Use spaces instead of tabs
" Text display
+set formatoptions=
+set formatoptions-=t " Don't autowrap text
+set formatoptions+=a " Autoformat text
+set formatoptions+=c " Do autowrap comments
+set formatoptions+=r " Automatically continue comments
+set formatoptions+=o " Automatically continue comments when hitting 'o' or 'O'
+set formatoptions+=q " Allow formatting of comments with 'gq'
+set formatoptions+=n " Recognize numbered lists
+set formatoptions+=l " Don't break long lines that were already there
+set textwidth=78 " Text width for comments
set nowrap " Don't wrap lines
set linebreak " Break lines when possible
set gcr=a:blinkon0 " Disable cursor blink
set cursorline " Command line completion fanciness
+
" Navigation
set scrolloff=3 " Line margin to start scrolling
set virtualedit=block " Allow the cursor to go anywhere in Visual Mode
@@ -64,11 +75,12 @@ filetype plugin indent on
if has("autocmd")
- " Force filetype text for txt files, since vim does not do it by default
- autocmd BufRead,BufNewFile *.txt setfiletype text
+ " Force md filetype all text-only files
+ " Note: Vim does not set txt as text by default
+ autocmd BufRead,BufNewFile *.{md,markdown,mdown,mkd,mkdn,txt} setf markdown
" Keep text files pretty and clean
- autocmd FileType text setlocal textwidth=78 wrap nolinebreak
+ autocmd FileType text,markdown,gitcommit setlocal wrap fo+=t
" Syntax of these languages is fussy over tabs Vs spaces
autocmd FileType make setlocal ts=8 sts=8 sw=8 noexpandtab
@@ -125,6 +137,10 @@ endif
" Key mappings
let mapleader = ","
+
+" Easy formatting, useful with text files
+map Q gq
+
" Map to strip white spaces
nnoremap <silent> rt :call <SID>StripTrailingWhitespaces()<CR>
@@ -167,3 +183,8 @@ function! InsertTabWrapper()
endfunction
inoremap <tab> <c-r>=InsertTabWrapper()<cr>
+
+" Autoload local .vimrc files
+if filereadable(expand("./.vimrc.local"))
+ source .vimrc.local
+endif

No commit comments for this range

Something went wrong with that request. Please try again.