Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 5 commits
  • 7 files changed
  • 0 comments
  • 2 contributors
4 palettes/.vimrc.local
... ... @@ -0,0 +1,4 @@
  1 +" Save, compile palette and set as color scheme
  2 +:nmap <leader>c :w<CR> :!palette watts_pastel.rb > ../vim/colors/watts.vim<CR> :colorscheme watts<CR>
  3 +:nmap <leader>d :w<CR> :!palette watts_dark.rb > ../vim/colors/watts_dark.vim<CR> :colorscheme watts_dark<CR>
  4 +
243 palettes/watts.rb
@@ -14,6 +14,13 @@ def swatch(name,color=nil)
14 14 @swatches[name.to_sym] = color if color
15 15 @swatches[name.to_sym]
16 16 end
  17 +
  18 + def swatches(hash)
  19 + hash.each do |k,v|
  20 + swatch k, v
  21 + end
  22 + end
  23 +
17 24 alias_method :sw, :swatch
18 25
19 26 def tint(color,weight=50)
@@ -34,64 +41,148 @@ def fade(color,weight=50)
34 41 notes "Light pastel theme"
35 42
36 43 reset true
37   - background :light
  44 + background :dark
38 45
39   - swatch :bg, 'FBF7EF'
40   - swatch :fg, '24231F'
  46 + # Basic
41 47
42   - swatch :grey, '8A8685'
  48 + swatch :red, 'D04432' # 'F80326'
  49 + swatch :blood, 'CF0500'
  50 + swatch :green, '00C63F'
  51 + swatch :blue, '314CDE' # '002BEE'
  52 + swatch :yellow, 'FFF92E'
  53 + swatch :gold, 'FACE00'
  54 + swatch :pink, 'D100BD'
43 55
44   - swatch :d_orange, '894204'
45   - swatch :l_orange, 'F96B01'
  56 + # Code palette
46 57
47   - swatch :d_green, '0F7C56'
48   - swatch :l_green, '02BD32'
  58 + swatches :bg => '211E1A', # '514746',
  59 + :fg => 'E3DED7', # 'F4F1EF',
  60 + :comment => '998D7E',
  61 + :method => '2F93F6',
  62 + :string => '69C30B', #'649400',
  63 + :numberic => '8749FF',
  64 + :keyword => 'C90FFF',
  65 + :variable => 'D80C57',
  66 + :symbol => 'F0127C', #'C60F70',
  67 + :type => '0BC37D', # 'D6331B',
  68 + :statement => 'D6D07C' #'4F59DC'
49 69
50   - swatch :d_blue, '1321EB'
51   - swatch :l_blue, '6C95FF'
  70 + # Vim palette
52 71
53   - swatch :d_mag, '9B1638'
54   - swatch :l_mag, 'A91F58'
  72 + swatches :cursor => 'C32481',
  73 + :search => '07FA00',
  74 + :msg => '28E883'
55 75
56   - swatch :d_cyan, '1455C0'
57   - swatch :l_cyan, '4AA8ED'
58 76
59   - swatch :d_turq, '169B79'
60   - swatch :l_turq, '28E883'
  77 + # Code definitions
61 78
62   - swatch :d_yellow, 'FCE868'
63   - swatch :l_yellow, 'FAFE5A'
  79 + Normal :fg => sw(:fg),
  80 + :bg => sw(:bg)
64 81
65   - swatch :purple, '461A65'
  82 + LineNr :fg => shade(:bg,50),
  83 + :bg => shade(:bg,5),
  84 + :gui => 'italic'
66 85
67   - swatch :violet, '4E1676'
  86 + Function :fg => sw(:method),
  87 + :bg => '2B3036'
68 88
69   - swatch :pink, 'DE2391'
  89 + Comment :fg => sw(:comment),
  90 + :bg => 'NONE',
  91 + :gui => 'italic'
  92 +
  93 + String :fg => sw(:string),
  94 + :bg => '30362B',
  95 + :gui => 'italic'
70 96
71   - swatch :red, 'F80326'
  97 + Number :fg => sw(:numberic),
  98 + :bg => '2B2B36'
72 99
73   - Normal :fg => fade(:fg,20),
74   - :bg => shade(:bg,5)
  100 + Keyword :fg => sw(:keyword),
  101 + :bg => '312B36',
  102 + :gui => 'italic'
75 103
76   - Function :fg => shade(:d_cyan,10)
  104 + Constant :fg => sw(:keyword),
  105 + :bg => '312B36'
77 106
78   - Comment :fg => sw(:grey),
79   - :bg => 'NONE',
  107 + Identifier :fg => sw(:variable),
  108 + :bg => '362B2B'
  109 +
  110 + Special :fg => sw(:symbol),
  111 + :bg => '362B36',
80 112 :gui => 'italic'
81 113
82   - Todo :fg => shade(mix(:red,:fg),80),
  114 + Typedef :fg => sw(:type),
  115 + :bg => 'NONE'
  116 +
  117 + Statement :fg => sw(:statement),
  118 + :bg => 'NONE'
  119 +
  120 + Todo :fg => mix(:red,:comment,30),
83 121 :bg => 'NONE',
84 122 :gui => 'bold,italic'
85 123
86   - LineNr :fg => tint(:fg,60),
87   - :bg => shade(:bg,8),
  124 + Delimiter :fg => sw(:blood),
88 125 :gui => 'italic'
89 126
  127 + PreProc :fg => sw(:blue)
  128 +
  129 + StorageClass :fg => sw(:fg),
  130 + :gui => 'italic'
  131 +
  132 + type :fg => sw(:type),
  133 + :bg => '2B3636'
  134 +
  135 + link :Repeat, :to => :Statement
  136 +
  137 + link :Operator, :to => :Special
  138 +
  139 + link :Label, :to => :Identifier
  140 +
  141 + # Ruby
  142 +
  143 + link :rubySymbol, :to => :Special
  144 +
  145 + link :rubyInterpolation, :to => :Normal
  146 +
  147 + link :rubyStringDelimiter, :to => :String
  148 +
  149 + link :rubyDefine,
  150 + :rubyMethodExceptional,
  151 + :rubyClass,
  152 + :rubyModule,
  153 + :to => :Statement
  154 +
  155 + # Javascript
  156 +
  157 + link :javaScriptType,
  158 + :javaScriptNull,
  159 + :javaScriptThis,
  160 + :to => :Keyword
  161 +
  162 + link :javaScriptGlobalObjects, :to => :type
  163 +
  164 + # CSS
  165 +
  166 + link :cssSelectorOp, :cssSelectorOp2, :to => :PreProc
  167 +
  168 + # Git
  169 +
  170 + gitCommitType :fg => sw(:comment),
  171 + :gui => 'bold,italic'
  172 +
  173 + gitCommitFile :fg => sw(:type)
  174 +
  175 + link :gitcommitSummary, :to => :Title
  176 + link :gitcommitHeader, :to => :gitcommitType
  177 + link :gitcommitOverflow, :to => :Error
  178 +
  179 + # Vim definitions
  180 +
90 181 Cursor :fg => sw(:bg),
91   - :bg => shade(:pink,20)
  182 + :bg => sw(:cursor)
92 183
93 184 CursorLine :fg => 'NONE',
94   - :bg => 'FFF'
  185 + :bg => shade(:bg,5)
95 186
96 187 StatusLine :fg => sw(:bg),
97 188 :bg => fade(:fg,30),
@@ -104,109 +195,77 @@ def fade(color,weight=50)
104 195 VertSplit :fg => fade(:fg,30),
105 196 :bg => fade(:fg,30)
106 197
107   - String :fg => sw(:d_turq),
108   - :bg => 'NONE',
109   - :gui => 'italic'
  198 + Visual :bg => fade(:yellow,20)
110 199
111   - Number :fg => shade(:red,20),
112   - :bg => 'NONE'
  200 + VisualNOS :bg => fade(:yellow,40)
113 201
114   - Constant :fg => shade(:l_turq,30),
115   - :bg => 'NONE',
  202 + IncSearch :fg => sw(:fg),
  203 + :bg => sw(:search),
116 204 :gui => 'bold'
117 205
118   - Identifier :fg => shade(:pink,20),
119   - :bg => 'NONE',
120   - :gui => 'italic'
121   -
122   - Special :fg => sw(:d_cyan),
123   - :bg => 'NONE',
124   - :gui => 'italic'
125   -
126   - type :fg => shade(:l_orange,20),
127   - :bg => 'NONE'
  206 + Search :fg => sw(:fg),
  207 + :bg => fade(:search),
  208 + :gui => 'bold'
128 209
129   - Statement :fg => mix(fade(:d_cyan,40),:violet),
130   - :bg => 'NONE',
131   - :gui => 'italic'
  210 + NonText :fg => fade(:fg),
  211 + :bg => fade(:fg,95),
  212 + :gui => 'bold'
132 213
133 214 Error :fg => sw(:bg),
134 215 :bg => sw(:red),
135 216 :gui => 'bold'
136 217
137 218 WarningMsg :fg => sw(:bg),
138   - :bg => sw(:l_orange),
139   - :gui => 'bold'
140   -
141   - Visual :bg => sw(:d_yellow)
142   -
143   - VisualNOS :bg => sw(:l_yellow)
144   -
145   - IncSearch :fg => sw(:bg),
146   - :bg => sw(:d_cyan),
147   - :gui => 'bold'
148   -
149   - Search :fg => sw(:bg),
150   - :bg => sw(:l_cyan),
151   - :gui => 'bold'
152   -
153   - NonText :fg => fade(:fg),
154   - :bg => fade(:fg,95),
  219 + :bg => sw(:red),
155 220 :gui => 'bold'
156 221
157   - SpecialKey :fg => sw(:pink),
158   - :bg => sw(:l_yellow)
159   -
160   - Directory :fg => sw(:l_blue)
  222 + Directory :fg => sw(:blue)
161 223
162   - DiffAdd :fg => sw(:d_green),
163   - :bg => fade(:d_green,90)
  224 + DiffAdd :fg => sw(:green),
  225 + :bg => fade(:green,90)
164 226
165 227 DiffChange :fg => sw(:fg),
166   - :bg => fade(:d_yellow)
  228 + :bg => fade(:yellow)
167 229
168 230 DiffDelete :fg => sw(:red),
169 231 :bg => fade(:red,90)
170 232
171 233 DiffText :fg => tint(:fg,30),
172   - :bg => fade(:d_yellow,90)
  234 + :bg => fade(:yellow,90)
173 235
174 236 Pmenu :fg => shade('FFF',70),
175 237 :bg => shade('FFF',12)
176 238
177 239 PmenuSel :fg => sw(:fg),
178   - :bg => sw(:d_yellow),
  240 + :bg => sw(:yellow),
179 241 :gui => 'bold'
180 242
181 243 PmenuThumb :fg => sw(:bg),
182 244 :bg => fade(:fg,10)
183 245
184 246 WildMenu :fg => sw(:fg),
185   - :bg => sw(:l_yellow),
  247 + :bg => sw(:yellow),
186 248 :gui => 'italic'
187 249
188   - MatchParen :fg => sw(:bg),
189   - :bg => fade(sw(:pink),30)
  250 + MatchParen :fg => sw(:fg),
  251 + :bg => sw(:gold)
190 252
191   - MoreMsg :fg => sw(:l_turq),
192   - :bg => sw(:bg),
  253 + MoreMsg :fg => sw(:fg),
  254 + :bg => sw(:msg),
193 255 :gui => 'bold'
194 256
195   - Question :fg => sw(:d_turq),
  257 + Question :fg => sw(:msg),
196 258 :bg => 'NONE',
197 259 :gui => 'bold'
198 260
199 261 ModeMsg :fg => sw(:fg),
200   - :bg => fade(:l_turq)
  262 + :bg => fade(:msg)
  263 +
  264 + Title :fg => sw(:fg),
  265 + :gui => 'bold'
201 266
  267 + PreProc :fg => sw(:blue)
202 268
203   - link :Delimiter, :rubyInterpolation, :to => :String
204   - link :rubySymbol, :to => :Special
205   - link :rubyDefine, :rubyMethodExceptional, :rubyClass, :rubyModule, :to => :Statement
206   - link :Typedef, :rubyConstant, :to => :type
207 269 link :ErrorMsg, :to => :Error
208 270 link :PmenuSbar, :to => :PmenuSel
209   - # link :vimComment, :vimCommentString, :vimCommentTitle, :to => :Comment
210   - # link :rubyFunction, :to => :Function
211   - # link :vimFold, :FoldColumn, :to => :Folded
212 271 end
245 palettes/watts_dark.rb
... ... @@ -0,0 +1,245 @@
  1 +Palette::ColorScheme.class_eval do
  2 + def mix(hex_a,hex_b,weight=50)
  3 + color1, color2 = hex_a, hex_b
  4 + color1 = swatch(hex_a) if hex_a.is_a?(Symbol) && swatch(hex_a)
  5 + color2 = swatch(hex_b) if hex_b.is_a?(Symbol) && swatch(hex_b)
  6 + sass_evaluator(:mix, hex_to_sass_color(color1), hex_to_sass_color(color2), Sass::Script::Number.new(weight))
  7 + end
  8 +
  9 + # TODO: This is a todo
  10 + # Cool!!
  11 + #
  12 + def swatch(name,color=nil)
  13 + @swatches ||= Hash.new
  14 + @swatches[name.to_sym] = color if color
  15 + @swatches[name.to_sym]
  16 + end
  17 +
  18 + def swatches(hash)
  19 + hash.each do |k,v|
  20 + swatch k, v
  21 + end
  22 + end
  23 +
  24 + alias_method :sw, :swatch
  25 +
  26 + def tint(color,weight=50)
  27 + mix('FFF',color,weight)
  28 + end
  29 +
  30 + def shade(color,weight=50)
  31 + mix(sw(:fg) || '000',color,weight)
  32 + end
  33 +
  34 + def fade(color,weight=50)
  35 + mix(sw(:bg) || 'FFF',color,weight)
  36 + end
  37 +end
  38 +
  39 +vim_colors "watts_dark" do
  40 + author "Marcos A."
  41 + notes "Light pastel theme"
  42 +
  43 + reset true
  44 + background :dark
  45 +
  46 + # Basic
  47 +
  48 + swatch :red, 'D04432' # 'F80326'
  49 + swatch :blood, 'CF0500'
  50 + swatch :green, '00C63F'
  51 + swatch :blue, '314CDE' # '002BEE'
  52 + swatch :yellow, 'FFF455'
  53 + swatch :gold, 'FACE00'
  54 + swatch :pink, 'D100BD'
  55 + swatch :crimson, '540009'
  56 +
  57 + # Code palette
  58 +
  59 + swatches :bg => '211E1A', # '514746',
  60 + :fg => 'E3DED7', # 'F4F1EF',
  61 + :comment => '998D7E',
  62 + :method => '2F93F6',
  63 + :string => '69C30B', #'649400',
  64 + :numeric => '8749FF',
  65 + :keyword => 'C90FFF',
  66 + :variable => 'D80C57',
  67 + :symbol => 'F0127C', #'C60F70',
  68 + :type => '0BC37D', # 'D6331B',
  69 + :statement => 'D6D07C' #'4F59DC'
  70 +
  71 + # Vim palette
  72 +
  73 + swatches :cursor => 'C32481',
  74 + :search => '5458F5',
  75 + :msg => '28E883'
  76 +
  77 +
  78 + # Code definitions
  79 +
  80 + Normal :fg => sw(:fg),
  81 + :bg => sw(:bg)
  82 +
  83 + LineNr :fg => shade(:bg,50),
  84 + :bg => shade(:bg,5)
  85 +
  86 + Function :fg => sw(:method),
  87 + :bg => '2B3036'
  88 +
  89 + Comment :fg => sw(:comment),
  90 + :bg => 'NONE'
  91 +
  92 + String :fg => sw(:string),
  93 + :bg => '30362B'
  94 +
  95 + Number :fg => sw(:numeric),
  96 + :bg => '2B2B36'
  97 +
  98 + Keyword :fg => sw(:keyword),
  99 + :bg => '312B36'
  100 +
  101 + Constant :fg => sw(:keyword),
  102 + :bg => '312B36'
  103 +
  104 + Identifier :fg => sw(:variable),
  105 + :bg => '362B2B'
  106 +
  107 + Special :fg => sw(:symbol),
  108 + :bg => '362B36'
  109 +
  110 + Typedef :fg => sw(:type),
  111 + :bg => 'NONE'
  112 +
  113 + Statement :fg => sw(:statement),
  114 + :bg => 'NONE'
  115 +
  116 + Todo :fg => mix(:red,:comment,30),
  117 + :bg => 'NONE'
  118 +
  119 + Delimiter :fg => sw(:blood)
  120 +
  121 + PreProc :fg => sw(:blue)
  122 +
  123 + StorageClass :fg => sw(:fg)
  124 +
  125 + type :fg => sw(:type),
  126 + :bg => '2B3636'
  127 +
  128 + link :Repeat, :to => :Statement
  129 +
  130 + link :Operator, :to => :Special
  131 +
  132 + link :Label, :to => :Identifier
  133 +
  134 + # Ruby
  135 +
  136 + link :rubySymbol, :to => :Special
  137 +
  138 + link :rubyInterpolation, :to => :Normal
  139 +
  140 + link :rubyStringDelimiter, :to => :String
  141 +
  142 + link :rubyDefine,
  143 + :rubyMethodExceptional,
  144 + :rubyClass,
  145 + :rubyModule,
  146 + :to => :Statement
  147 +
  148 + # Javascript
  149 +
  150 + link :javaScriptType,
  151 + :javaScriptNull,
  152 + :javaScriptThis,
  153 + :to => :Keyword
  154 +
  155 + link :javaScriptGlobalObjects, :to => :type
  156 +
  157 + # CSS
  158 +
  159 + link :cssSelectorOp, :cssSelectorOp2, :to => :PreProc
  160 +
  161 + # Git
  162 +
  163 + gitCommitType :fg => sw(:comment),
  164 + :gui => 'bold,italic'
  165 +
  166 + gitCommitFile :fg => sw(:type)
  167 +
  168 + link :gitcommitSummary, :to => :Title
  169 + link :gitcommitHeader, :to => :gitcommitType
  170 + link :gitcommitOverflow, :to => :Error
  171 +
  172 + # Vim definitions
  173 +
  174 + Cursor :bg => sw(:cursor)
  175 +
  176 + CursorLine :fg => 'NONE',
  177 + :bg => shade(:bg,5)
  178 +
  179 + StatusLine :fg => sw(:bg),
  180 + :bg => fade(:fg,30)
  181 +
  182 + StatusLineNC :fg => sw(:bg),
  183 + :bg => fade(:fg,50)
  184 +
  185 + VertSplit :fg => fade(:fg,30),
  186 + :bg => fade(:fg,30)
  187 +
  188 + Visual :bg => fade(:yellow,80)
  189 +
  190 + VisualNOS :bg => fade(:yellow,70)
  191 +
  192 + IncSearch :bg => sw(:search)
  193 +
  194 + Search :bg => fade(:search,20)
  195 +
  196 + NonText :fg => fade(:fg),
  197 + :bg => fade(:fg,95)
  198 +
  199 + Error :bg => sw(:red)
  200 +
  201 + WarningMsg :fg => sw(:bg),
  202 + :bg => sw(:red)
  203 +
  204 + Directory :fg => sw(:blue)
  205 +
  206 + DiffAdd :fg => sw(:green),
  207 + :bg => fade(:green,90)
  208 +
  209 + DiffChange :fg => sw(:fg),
  210 + :bg => fade(:yellow)
  211 +
  212 + DiffDelete :fg => sw(:red),
  213 + :bg => fade(:red,90)
  214 +
  215 + DiffText :fg => tint(:fg,30),
  216 + :bg => fade(:yellow,90)
  217 +
  218 + Pmenu :fg => sw(:bg),
  219 + :bg => tint(:bg,65)
  220 +
  221 + PmenuSel :bg => 'FFF455'
  222 +
  223 + MatchParen :fg => sw(:fg),
  224 + :bg => sw(:gold)
  225 +
  226 + MoreMsg :fg => sw(:fg),
  227 + :bg => sw(:msg),
  228 + :gui => 'bold'
  229 +
  230 + Question :fg => sw(:msg),
  231 + :bg => 'NONE',
  232 + :gui => 'bold'
  233 +
  234 + ModeMsg :fg => sw(:fg),
  235 + :bg => fade(:msg)
  236 +
  237 + Title :fg => sw(:fg)
  238 +
  239 + PreProc :fg => sw(:blue)
  240 +
  241 + SpellBad :bg => sw(:crimson)
  242 +
  243 + link :ErrorMsg, :to => :Error
  244 + link :PmenuSbar, :to => :PmenuSel
  245 +end
267 palettes/watts_pastel.rb
... ... @@ -0,0 +1,267 @@
  1 +Palette::ColorScheme.class_eval do
  2 + def mix(hex_a,hex_b,weight=50)
  3 + color1, color2 = hex_a, hex_b
  4 + color1 = swatch(hex_a) if hex_a.is_a?(Symbol) && swatch(hex_a)
  5 + color2 = swatch(hex_b) if hex_b.is_a?(Symbol) && swatch(hex_b)
  6 + sass_evaluator(:mix, hex_to_sass_color(color1), hex_to_sass_color(color2), Sass::Script::Number.new(weight))
  7 + end
  8 +
  9 + # TODO: This is a todo
  10 + # Cool!!
  11 + #
  12 + def swatch(name,color=nil)
  13 + @swatches ||= Hash.new
  14 + @swatches[name.to_sym] = color if color
  15 + @swatches[name.to_sym]
  16 + end
  17 +
  18 + def swatches(hash)
  19 + hash.each do |k,v|
  20 + swatch k, v
  21 + end
  22 + end
  23 +
  24 + alias_method :sw, :swatch
  25 +
  26 + def tint(color,weight=50)
  27 + mix('FFF',color,weight)
  28 + end
  29 +
  30 + def shade(color,weight=50)
  31 + mix(sw(:fg) || '000',color,weight)
  32 + end
  33 +
  34 + def fade(color,weight=50)
  35 + mix(sw(:bg) || 'FFF',color,weight)
  36 + end
  37 +end
  38 +
  39 +vim_colors "watts" do
  40 + author "Marcos A."
  41 + notes "Light pastel theme"
  42 +
  43 + reset true
  44 + background :light
  45 +
  46 + # Basic
  47 +
  48 + swatch :red, 'D04432' # 'F80326'
  49 + swatch :blood, 'CF0500'
  50 + swatch :green, '00C63F'
  51 + swatch :blue, '314CDE' # '002BEE'
  52 + swatch :yellow, 'FFF92E'
  53 + swatch :gold, 'FACE00'
  54 + swatch :pink, 'D100BD'
  55 +
  56 + # Code palette
  57 +
  58 + swatches :fg => '5A5957', # '514746',
  59 + :bg => 'EAE9E7', # 'F4F1EF',
  60 + :method => '4375A3',
  61 + :string => '60A345', #'649400',
  62 + :keyword => '825196',
  63 + :numeric => '5F5196',
  64 + :variable => 'BB435B',
  65 + :symbol => 'C34E8D', #'C60F70',
  66 + :type => '45A388', # 'D6331B',
  67 + :statement => '5996A6' #'4F59DC'
  68 +
  69 + # Vim palette
  70 +
  71 + swatches :cursor => 'C32481',
  72 + :search => '07FA00',
  73 + :msg => '28E883'
  74 +
  75 +
  76 + # Code definitions
  77 +
  78 + Normal :fg => sw(:fg),
  79 + :bg => sw(:bg)
  80 +
  81 + LineNr :fg => tint(:fg,50),
  82 + :bg => shade(:bg,5),
  83 + :gui => 'italic'
  84 +
  85 + Function :fg => sw(:method)
  86 +
  87 + Comment :fg => fade(:fg),
  88 + :bg => 'NONE',
  89 + :gui => 'italic'
  90 +
  91 + String :fg => sw(:string),
  92 + :gui => 'italic'
  93 +
  94 + Number :fg => sw(:numeric),
  95 + :bg => 'NONE'
  96 +
  97 + Keyword :fg => sw(:keyword),
  98 + :gui => 'italic'
  99 +
  100 + Constant :fg => sw(:keyword),
  101 + :bg => 'NONE'
  102 +
  103 + Identifier :fg => sw(:variable),
  104 + :bg => 'NONE'
  105 +
  106 + Special :fg => sw(:symbol),
  107 + :bg => 'NONE',
  108 + :gui => 'italic'
  109 +
  110 + Typedef :fg => sw(:type),
  111 + :bg => 'NONE'
  112 +
  113 + Statement :fg => sw(:statement),
  114 + :bg => 'NONE'
  115 +
  116 + Todo :fg => fade(:fg),
  117 + :bg => fade(:yellow),
  118 + :gui => 'bold,italic'
  119 +
  120 + Delimiter :fg => sw(:blood),
  121 + :gui => 'italic'
  122 +
  123 + PreProc :fg => sw(:blue)
  124 +
  125 + StorageClass :fg => sw(:fg),
  126 + :gui => 'italic'
  127 +
  128 + type :fg => sw(:type),
  129 + :bg => 'NONE'
  130 +
  131 + link :Repeat, :to => :Statement
  132 +
  133 + link :Operator, :to => :Special
  134 +
  135 + link :Label, :to => :Identifier
  136 +
  137 + # Ruby
  138 +
  139 + link :rubySymbol, :to => :Special
  140 +
  141 + link :rubyInterpolation, :to => :Normal
  142 +
  143 + link :rubyStringDelimiter, :to => :String
  144 +
  145 + link :rubyDefine,
  146 + :rubyMethodExceptional,
  147 + :rubyClass,
  148 + :rubyModule,
  149 + :to => :Statement
  150 +
  151 + # Javascript
  152 +
  153 + link :javaScriptType,
  154 + :javaScriptNull,
  155 + :javaScriptThis,
  156 + :to => :Keyword
  157 +
  158 + link :javaScriptGlobalObjects, :to => :type
  159 +
  160 + # CSS
  161 +
  162 + link :cssSelectorOp, :cssSelectorOp2, :to => :PreProc
  163 +
  164 + # Git
  165 +
  166 + gitCommitType :fg => fade(:fg),
  167 + :gui => 'bold,italic'
  168 +
  169 + gitCommitFile :fg => sw(:type)
  170 +
  171 + link :gitcommitSummary, :to => :Title
  172 + link :gitcommitHeader, :to => :gitcommitType
  173 + link :gitcommitOverflow, :to => :Error
  174 +
  175 + # Vim definitions
  176 +
  177 + Cursor :fg => sw(:bg),
  178 + :bg => sw(:cursor)
  179 +
  180 + CursorLine :fg => 'NONE',
  181 + :bg => shade(:bg,5)
  182 +
  183 + StatusLine :fg => sw(:bg),
  184 + :bg => fade(:fg,30),
  185 + :gui => 'italic'
  186 +
  187 + StatusLineNC :fg => sw(:bg),
  188 + :bg => fade(:fg,50),
  189 + :gui => 'italic'
  190 +
  191 + VertSplit :fg => fade(:fg,30),
  192 + :bg => fade(:fg,30)
  193 +
  194 + Visual :bg => fade(:yellow,20)
  195 +
  196 + VisualNOS :bg => fade(:yellow,40)
  197 +
  198 + IncSearch :fg => sw(:fg),
  199 + :bg => sw(:search),
  200 + :gui => 'bold'
  201 +
  202 + Search :fg => sw(:fg),
  203 + :bg => fade(:search),
  204 + :gui => 'bold'
  205 +
  206 + NonText :fg => fade(:fg),
  207 + :bg => fade(:fg,95),
  208 + :gui => 'bold'
  209 +
  210 + Error :fg => sw(:bg),
  211 + :bg => sw(:red),
  212 + :gui => 'bold'
  213 +
  214 + WarningMsg :fg => sw(:bg),
  215 + :bg => sw(:red),
  216 + :gui => 'bold'
  217 +
  218 + Directory :fg => sw(:blue)
  219 +
  220 + DiffAdd :fg => sw(:green),
  221 + :bg => fade(:green,90)
  222 +
  223 + DiffChange :fg => sw(:fg),
  224 + :bg => fade(:yellow)
  225 +
  226 + DiffDelete :fg => sw(:red),
  227 + :bg => fade(:red,90)
  228 +
  229 + DiffText :fg => tint(:fg,30),
  230 + :bg => fade(:yellow,90)
  231 +
  232 + Pmenu :fg => shade('FFF',70),
  233 + :bg => shade('FFF',12)
  234 +
  235 + PmenuSel :fg => sw(:fg),
  236 + :bg => sw(:yellow),
  237 + :gui => 'bold'
  238 +
  239 + PmenuThumb :fg => sw(:bg),
  240 + :bg => fade(:fg,10)
  241 +
  242 + WildMenu :fg => sw(:fg),
  243 + :bg => sw(:yellow),
  244 + :gui => 'italic'
  245 +
  246 + MatchParen :fg => sw(:fg),
  247 + :bg => sw(:gold)
  248 +
  249 + MoreMsg :fg => sw(:fg),
  250 + :bg => sw(:msg),
  251 + :gui => 'bold'
  252 +
  253 + Question :fg => sw(:msg),
  254 + :bg => 'NONE',
  255 + :gui => 'bold'
  256 +
  257 + ModeMsg :fg => sw(:fg),
  258 + :bg => fade(:msg)
  259 +
  260 + Title :fg => sw(:fg),
  261 + :gui => 'bold'
  262 +
  263 + PreProc :fg => sw(:blue)
  264 +
  265 + link :ErrorMsg, :to => :Error
  266 + link :PmenuSbar, :to => :PmenuSel
  267 +end
272 palettes/watts_vivid.rb
... ... @@ -0,0 +1,272 @@
  1 +Palette::ColorScheme.class_eval do
  2 + def mix(hex_a,hex_b,weight=50)
  3 + color1, color2 = hex_a, hex_b
  4 + color1 = swatch(hex_a) if hex_a.is_a?(Symbol) && swatch(hex_a)
  5 + color2 = swatch(hex_b) if hex_b.is_a?(Symbol) && swatch(hex_b)
  6 + sass_evaluator(:mix, hex_to_sass_color(color1), hex_to_sass_color(color2), Sass::Script::Number.new(weight))
  7 + end
  8 +
  9 + # TODO: This is a todo for testing the color scheme
  10 + #
  11 + #
  12 + def swatch(name,color=nil)
  13 + @swatches ||= Hash.new
  14 + @swatches[name.to_sym] = color if color
  15 + @swatches[name.to_sym]
  16 + end
  17 +
  18 + def swatches(hash)
  19 + hash.each do |k,v|
  20 + swatch k, v
  21 + end
  22 + end
  23 +
  24 + alias_method :sw, :swatch
  25 +
  26 + def tint(color,weight=50)
  27 + mix('FFF',color,weight)
  28 + end
  29 +
  30 + def shade(color,weight=50)
  31 + mix(sw(:fg) || '000',color,weight)
  32 + end
  33 +
  34 + def fade(color,weight=50)
  35 + mix(sw(:bg) || 'FFF',color,weight)
  36 + end
  37 +end
  38 +
  39 +vim_colors "watts" do
  40 + author "Markus A. Stone"
  41 + notes "Light pastel theme"
  42 +
  43 + reset true
  44 + background :light
  45 +
  46 + # Basic
  47 +
  48 + swatch :red, 'D04432' # 'F80326'
  49 + swatch :blood, 'CF0500'
  50 + swatch :green, '00C63F'
  51 + swatch :blue, '314CDE' # '002BEE'
  52 + swatch :yellow, 'FFF92E'
  53 + swatch :gold, 'FACE00'
  54 + swatch :pink, 'D100BD'
  55 +
  56 + # Code palette
  57 +
  58 + swatches :fg => '5E554A', # '514746',
  59 + :bg => 'DED8D2', # 'F4F1EF',
  60 + :comment => '998D7E',
  61 + :method => '1664AE',
  62 + :string => '5CAB0A', #'649400',
  63 + :numberic => '410AAB',
  64 + :keyword => '920AAB',
  65 + :variable => 'D80C57',
  66 + :symbol => 'C90B79', #'C60F70',
  67 + :type => '09A16B', # 'D6331B',
  68 + :statement => 'E0D7C1' #'4F59DC'
  69 +
  70 + # Vim palette
  71 +
  72 + swatches :cursor => 'C32481',
  73 + :search => '07FA00',
  74 + :msg => '28E883'
  75 +
  76 +
  77 + # Code definitions
  78 +
  79 + Normal :fg => sw(:fg),
  80 + :bg => sw(:bg)
  81 +
  82 + LineNr :fg => tint(:fg,50),
  83 + :bg => shade(:bg,5),
  84 + :gui => 'italic'
  85 +
  86 + Function :fg => sw(:method),
  87 + :bg => 'D2D7DE'
  88 +
  89 + Comment :fg => sw(:comment),
  90 + :bg => 'NONE',
  91 + :gui => 'italic'
  92 +
  93 + String :fg => sw(:string),
  94 + :bg => 'D7DED2',
  95 + :gui => 'italic'
  96 +
  97 + Number :fg => sw(:numberic),
  98 + :bg => 'D2D2DE'
  99 +
  100 + Keyword :fg => sw(:keyword),
  101 + :bg => 'D8D2DE',
  102 + :gui => 'italic'
  103 +
  104 + Constant :fg => sw(:keyword),
  105 + :bg => 'D8D2DE'
  106 +
  107 + Identifier :fg => sw(:variable),
  108 + :bg => 'DED2D2'
  109 +
  110 + Special :fg => sw(:symbol),
  111 + :bg => 'DED2D7',
  112 + :gui => 'italic'
  113 +
  114 + Typedef :fg => sw(:type),
  115 + :bg => 'NONE'
  116 +
  117 + Statement :bg => sw(:statement),
  118 + :fg => '6C554A',
  119 + :gui => 'italic'
  120 +
  121 + Todo :fg => mix(:red,:comment,30),
  122 + :bg => 'NONE',
  123 + :gui => 'bold,italic'
  124 +
  125 + Delimiter :fg => sw(:blood),
  126 + :gui => 'italic'
  127 +
  128 + PreProc :fg => sw(:blue)
  129 +
  130 + StorageClass :fg => sw(:fg),
  131 + :gui => 'italic'
  132 +
  133 + type :fg => sw(:type),
  134 + :bg => 'D2DED8'
  135 +
  136 + link :Repeat, :to => :Statement
  137 +
  138 + link :Operator, :to => :Special
  139 +
  140 + link :Label, :to => :Identifier
  141 +
  142 + # Ruby
  143 +
  144 + link :rubySymbol, :to => :Special
  145 +
  146 + link :rubyInterpolation, :to => :Normal
  147 +
  148 + link :rubyStringDelimiter, :to => :String
  149 +
  150 + link :rubyDefine,
  151 + :rubyMethodExceptional,
  152 + :rubyClass,
  153 + :rubyModule,
  154 + :to => :Statement
  155 +
  156 + # Javascript
  157 +
  158 + link :javaScriptType,
  159 + :javaScriptNull,
  160 + :javaScriptThis,
  161 + :to => :Keyword
  162 +
  163 + link :javaScriptGlobalObjects, :to => :type
  164 +
  165 + # CSS
  166 +
  167 + link :cssSelectorOp, :cssSelectorOp2, :to => :PreProc
  168 +
  169 + # Git
  170 +
  171 + gitCommitType :fg => sw(:comment),
  172 + :gui => 'bold,italic'
  173 +
  174 + gitCommitFile :fg => sw(:type)
  175 +
  176 + link :gitcommitSummary, :to => :Title
  177 + link :gitcommitHeader, :to => :gitcommitType
  178 + link :gitcommitOverflow, :to => :Error
  179 +
  180 + # Vim definitions
  181 +
  182 + Cursor :fg => sw(:bg),
  183 + :bg => sw(:cursor)
  184 +
  185 + CursorLine :fg => 'NONE',
  186 + :bg => shade(:bg,5)
  187 +
  188 + StatusLine :fg => sw(:bg),
  189 + :bg => fade(:fg,30),
  190 + :gui => 'italic'
  191 +
  192 + StatusLineNC :fg => sw(:bg),
  193 + :bg => fade(:fg,50),
  194 + :gui => 'italic'
  195 +
  196 + VertSplit :fg => fade(:fg,30),
  197 + :bg => fade(:fg,30)
  198 +
  199 + Visual :bg => fade(:yellow,20)
  200 +
  201 + VisualNOS :bg => fade(:yellow,40)
  202 +
  203 + IncSearch :fg => sw(:fg),
  204 + :bg => sw(:search),
  205 + :gui => 'bold'
  206 +
  207 + Search :fg => sw(:fg),
  208 + :bg => fade(:search),
  209 + :gui => 'bold'
  210 +
  211 + NonText :fg => fade(:fg),
  212 + :bg => fade(:fg,95),
  213 + :gui => 'bold'
  214 +
  215 + Error :fg => sw(:bg),
  216 + :bg => sw(:red),
  217 + :gui => 'bold'
  218 +
  219 + WarningMsg :fg => sw(:bg),
  220 + :bg => sw(:red),
  221 + :gui => 'bold'
  222 +
  223 + Directory :fg => sw(:blue)
  224 +
  225 + DiffAdd :fg => sw(:green),
  226 + :bg => fade(:green,90)
  227 +
  228 + DiffChange :fg => sw(:fg),
  229 + :bg => fade(:yellow)
  230 +
  231 + DiffDelete :fg => sw(:red),
  232 + :bg => fade(:red,90)
  233 +
  234 + DiffText :fg => tint(:fg,30),
  235 + :bg => fade(:yellow,90)
  236 +
  237 + Pmenu :fg => shade('FFF',70),
  238 + :bg => shade('FFF',12)
  239 +
  240 + PmenuSel :fg => sw(:fg),
  241 + :bg => sw(:yellow),
  242 + :gui => 'bold'
  243 +
  244 + PmenuThumb :fg => sw(:bg),
  245 + :bg => fade(:fg,10)
  246 +
  247 + WildMenu :fg => sw(:fg),
  248 + :bg => sw(:yellow),
  249 + :gui => 'italic'
  250 +
  251 + MatchParen :fg => sw(:fg),
  252 + :bg => sw(:gold)
  253 +
  254 + MoreMsg :fg => sw(:fg),
  255 + :bg => sw(:msg),
  256 + :gui => 'bold'
  257 +
  258 + Question :fg => sw(:msg),
  259 + :bg => 'NONE',
  260 + :gui => 'bold'
  261 +
  262 + ModeMsg :fg => sw(:fg),
  263 + :bg => fade(:msg)
  264 +
  265 + Title :fg => sw(:fg),
  266 + :gui => 'bold'
  267 +
  268 + PreProc :fg => sw(:blue)
  269 +
  270 + link :ErrorMsg, :to => :Error
  271 + link :PmenuSbar, :to => :PmenuSel
  272 +end
116 vim/colors/watts.vim
@@ -18,53 +18,71 @@ if has("gui_running")
18 18 set background=light
19 19 endif
20 20
21   -hi Normal guifg=#4F4D48 ctermfg=239 guibg=#F0ECE4 ctermbg=255 gui=NONE cterm=NONE
22   -hi Function guifg=#1550AF ctermfg=25 gui=NONE cterm=NONE
23   -hi Comment guifg=#8A8685 ctermfg=102 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
24   -hi Todo guifg=#391F1F ctermfg=235 guibg=NONE ctermbg=NONE gui=BOLD,ITALIC cterm=NONE
25   -hi LineNr guifg=#A7A7A5 ctermfg=248 guibg=#E9E6DE ctermbg=254 gui=ITALIC cterm=NONE
26   -hi Cursor guifg=#FBF7EF ctermfg=255 guibg=#B8237A ctermbg=126 gui=NONE cterm=NONE
27   -hi CursorLine guifg=NONE ctermfg=NONE guibg=#FFFFFF ctermbg=231 gui=NONE cterm=NONE
28   -hi StatusLine guifg=#FBF7EF ctermfg=255 guibg=#64625D ctermbg=241 gui=ITALIC cterm=NONE
29   -hi StatusLineNC guifg=#FBF7EF ctermfg=255 guibg=#8F8D87 ctermbg=245 gui=ITALIC cterm=NONE
30   -hi VertSplit guifg=#64625D ctermfg=241 guibg=#64625D ctermbg=241 gui=NONE cterm=NONE
31   -hi String guifg=#169B79 ctermfg=30 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
32   -hi Number guifg=#CD0924 ctermfg=160 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
33   -hi Constant guifg=#26AC64 ctermfg=35 guibg=NONE ctermbg=NONE gui=BOLD cterm=BOLD
34   -hi Identifier guifg=#B8237A ctermfg=126 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
35   -hi Special guifg=#1455C0 ctermfg=25 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
36   -hi type guifg=#CE5C07 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
37   -hi Statement guifg=#5F55A4 ctermfg=61 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
38   -hi Error guifg=#FBF7EF ctermfg=255 guibg=#F80326 ctermbg=196 gui=BOLD cterm=BOLD
39   -hi WarningMsg guifg=#FBF7EF ctermfg=255 guibg=#F96B01 ctermbg=202 gui=BOLD cterm=BOLD
40   -hi Visual guibg=#FCE868 ctermbg=221 gui=NONE cterm=NONE
41   -hi VisualNOS guibg=#FAFE5A ctermbg=227 gui=NONE cterm=NONE
42   -hi IncSearch guifg=#FBF7EF ctermfg=255 guibg=#1455C0 ctermbg=25 gui=BOLD cterm=BOLD
43   -hi Search guifg=#FBF7EF ctermfg=255 guibg=#4AA8ED ctermbg=75 gui=BOLD cterm=BOLD
44   -hi NonText guifg=#8F8D87 ctermfg=245 guibg=#F0ECE4 ctermbg=255 gui=BOLD cterm=BOLD
45   -hi SpecialKey guifg=#DE2391 ctermfg=162 guibg=#FAFE5A ctermbg=227 gui=NONE cterm=NONE
46   -hi Directory guifg=#6C95FF ctermfg=69 gui=NONE cterm=NONE
47   -hi DiffAdd guifg=#0F7C56 ctermfg=29 guibg=#E3EADF ctermbg=254 gui=NONE cterm=NONE
48   -hi DiffChange guifg=#24231F ctermfg=235 guibg=#FBEFAB ctermbg=229 gui=NONE cterm=NONE
49   -hi DiffDelete guifg=#F80326 ctermfg=196 guibg=#FADEDA ctermbg=224 gui=NONE cterm=NONE
50   -hi DiffText guifg=#656562 ctermfg=241 guibg=#FBF5E1 ctermbg=230 gui=NONE cterm=NONE
51   -hi Pmenu guifg=#656562 ctermfg=241 guibg=#E4E4E4 ctermbg=254 gui=NONE cterm=NONE
52   -hi PmenuSel guifg=#24231F ctermfg=235 guibg=#FCE868 ctermbg=221 gui=BOLD cterm=BOLD
53   -hi PmenuThumb guifg=#FBF7EF ctermfg=255 guibg=#393833 ctermbg=237 gui=NONE cterm=NONE
54   -hi WildMenu guifg=#24231F ctermfg=235 guibg=#FAFE5A ctermbg=227 gui=ITALIC cterm=NONE
55   -hi MatchParen guifg=#FBF7EF ctermfg=255 guibg=#E662AD ctermbg=169 gui=NONE cterm=NONE
56   -hi MoreMsg guifg=#28E883 ctermfg=42 guibg=#FBF7EF ctermbg=255 gui=BOLD cterm=BOLD
57   -hi Question guifg=#169B79 ctermfg=30 guibg=NONE ctermbg=NONE gui=BOLD cterm=BOLD
58   -hi ModeMsg guifg=#24231F ctermfg=235 guibg=#91EFB9 ctermbg=121 gui=NONE cterm=NONE
  21 +hi Normal guifg=#5A5957 ctermfg=240 guibg=#EAE9E7 ctermbg=254 gui=NONE cterm=NONE
  22 +hi LineNr guifg=#ACACAB ctermfg=145 guibg=#E2E1DF ctermbg=254 gui=ITALIC cterm=NONE
  23 +hi Function guifg=#4375A3 ctermfg=67 gui=NONE cterm=NONE
  24 +hi Comment guifg=#A2A19F ctermfg=247 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
  25 +hi String guifg=#60A345 ctermfg=71 gui=ITALIC cterm=NONE
  26 +hi Number guifg=#5F5196 ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
  27 +hi Keyword guifg=#825196 ctermfg=96 gui=ITALIC cterm=NONE
  28 +hi Constant guifg=#825196 ctermfg=96 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
  29 +hi Identifier guifg=#BB435B ctermfg=131 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
  30 +hi Special guifg=#C34E8D ctermfg=132 guibg=NONE ctermbg=NONE gui=ITALIC cterm=NONE
  31 +hi Typedef guifg=#45A388 ctermfg=72 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
  32 +hi Statement guifg=#5996A6 ctermfg=67 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
  33 +hi Todo guifg=#A2A19F ctermfg=247 guibg=#F4F18A ctermbg=228 gui=BOLD,ITALIC cterm=NONE
  34 +hi Delimiter guifg=#CF0500 ctermfg=160 gui=ITALIC cterm=NONE
  35 +hi PreProc guifg=#314CDE ctermfg=62 gui=NONE cterm=NONE
  36 +hi StorageClass guifg=#5A5957 ctermfg=240 gui=ITALIC cterm=NONE
  37 +hi type guifg=#45A388 ctermfg=72 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
  38 +hi gitCommitType guifg=#A2A19F ctermfg=247 gui=BOLD,ITALIC cterm=NONE
  39 +hi gitCommitFile guifg=#45A388 ctermfg=72 gui=NONE cterm=NONE
  40 +hi Cursor guifg=#EAE9E7 ctermfg=254 guibg=#C32481 ctermbg=126 gui=NONE cterm=NONE
  41 +hi CursorLine guifg=NONE ctermfg=NONE guibg=#E2E1DF ctermbg=254 gui=NONE cterm=NONE
  42 +hi StatusLine guifg=#EAE9E7 ctermfg=254 guibg=#858482 ctermbg=102 gui=ITALIC cterm=NONE
  43 +hi StatusLineNC guifg=#EAE9E7 ctermfg=254 guibg=#A2A19F ctermbg=247 gui=ITALIC cterm=NONE
  44 +hi VertSplit guifg=#858482 ctermfg=102 guibg=#858482 ctermbg=102 gui=NONE cterm=NONE
  45 +hi Visual guibg=#FAF553 ctermbg=227 gui=NONE cterm=NONE
  46 +hi VisualNOS guibg=#F6F278 ctermbg=228 gui=NONE cterm=NONE
  47 +hi IncSearch guifg=#5A5957 ctermfg=240 guibg=#07FA00 ctermbg=46 gui=BOLD cterm=BOLD
  48 +hi Search guifg=#5A5957 ctermfg=240 guibg=#78F173 ctermbg=119 gui=BOLD cterm=BOLD
  49 +hi NonText guifg=#A2A19F ctermfg=247 guibg=#E2E1DF ctermbg=254 gui=BOLD cterm=BOLD
  50 +hi Error guifg=#EAE9E7 ctermfg=254 guibg=#D04432 ctermbg=167 gui=BOLD cterm=BOLD
  51 +hi WarningMsg guifg=#EAE9E7 ctermfg=254 guibg=#D04432 ctermbg=167 gui=BOLD cterm=BOLD
  52 +hi Directory guifg=#314CDE ctermfg=62 gui=NONE cterm=NONE
  53 +hi DiffAdd guifg=#00C63F ctermfg=41 guibg=#D2E5D6 ctermbg=188 gui=NONE cterm=NONE
  54 +hi DiffChange guifg=#5A5957 ctermfg=240 guibg=#F4F18A ctermbg=228 gui=NONE cterm=NONE
  55 +hi DiffDelete guifg=#D04432 ctermfg=167 guibg=#E7D8D4 ctermbg=188 gui=NONE cterm=NONE
  56 +hi DiffText guifg=#8B8A89 ctermfg=245 guibg=#ECEAD4 ctermbg=254 gui=NONE cterm=NONE
  57 +hi Pmenu guifg=#8B8A89 ctermfg=245 guibg=#EBEBEA ctermbg=255 gui=NONE cterm=NONE
  58 +hi PmenuSel guifg=#5A5957 ctermfg=240 guibg=#FFF92E ctermbg=226 gui=BOLD cterm=BOLD
  59 +hi PmenuThumb guifg=#EAE9E7 ctermfg=254 guibg=#686765 ctermbg=241 gui=NONE cterm=NONE
  60 +hi WildMenu guifg=#5A5957 ctermfg=240 guibg=#FFF92E ctermbg=226 gui=ITALIC cterm=NONE
  61 +hi MatchParen guifg=#5A5957 ctermfg=240 guibg=#FACE00 ctermbg=220 gui=NONE cterm=NONE
  62 +hi MoreMsg guifg=#5A5957 ctermfg=240 guibg=#28E883 ctermbg=42 gui=BOLD cterm=BOLD
  63 +hi Question guifg=#28E883 ctermfg=42 guibg=NONE ctermbg=NONE gui=BOLD cterm=BOLD
  64 +hi ModeMsg guifg=#5A5957 ctermfg=240 guibg=#89E8B5 ctermbg=115 gui=NONE cterm=NONE
  65 +hi Title guifg=#5A5957 ctermfg=240 gui=BOLD cterm=BOLD
  66 +hi PreProc guifg=#314CDE ctermfg=62 gui=NONE cterm=NONE
59 67
60   -hi link Delimiter String
61   -hi link rubyInterpolation String
62   -hi link rubySymbol Special
63   -hi link rubyDefine Statement
64   -hi link rubyMethodExceptional Statement
65   -hi link rubyClass Statement
66   -hi link rubyModule Statement
67   -hi link Typedef type
68   -hi link rubyConstant type
69   -hi link ErrorMsg Error
70   -hi link PmenuSbar PmenuSel
  68 +hi link Repeat Statement
  69 +hi link Operator Special
  70 +hi link Label Identifier
  71 +hi link rubySymbol Special
  72 +hi link rubyInterpolation Normal
  73 +hi link rubyStringDelimiter String
  74 +hi link rubyDefine Statement
  75 +hi link rubyMethodExceptional Statement
  76 +hi link rubyClass Statement
  77 +hi link rubyModule Statement
  78 +hi link javaScriptType Keyword
  79 +hi link javaScriptNull Keyword
  80 +hi link javaScriptThis Keyword
  81 +hi link javaScriptGlobalObjects type
  82 +hi link cssSelectorOp PreProc
  83 +hi link cssSelectorOp2 PreProc
  84 +hi link gitcommitSummary Title
  85 +hi link gitcommitHeader gitcommitType
  86 +hi link gitcommitOverflow Error
  87 +hi link ErrorMsg Error
  88 +hi link PmenuSbar PmenuSel
27 vimrc
@@ -22,11 +22,22 @@ set ts=2 sts=2 sw=2 " Tab width in spaces
22 22 set expandtab " Use spaces instead of tabs
23 23
24 24 " Text display
  25 +set formatoptions=
  26 +set formatoptions-=t " Don't autowrap text
  27 +set formatoptions+=a " Autoformat text
  28 +set formatoptions+=c " Do autowrap comments
  29 +set formatoptions+=r " Automatically continue comments
  30 +set formatoptions+=o " Automatically continue comments when hitting 'o' or 'O'
  31 +set formatoptions+=q " Allow formatting of comments with 'gq'
  32 +set formatoptions+=n " Recognize numbered lists
  33 +set formatoptions+=l " Don't break long lines that were already there
  34 +set textwidth=78 " Text width for comments
25 35 set nowrap " Don't wrap lines
26 36 set linebreak " Break lines when possible
27 37 set gcr=a:blinkon0 " Disable cursor blink
28 38 set cursorline " Command line completion fanciness
29 39
  40 +
30 41 " Navigation
31 42 set scrolloff=3 " Line margin to start scrolling
32 43 set virtualedit=block " Allow the cursor to go anywhere in Visual Mode
@@ -64,11 +75,12 @@ filetype plugin indent on
64 75
65 76 if has("autocmd")
66 77
67   - " Force filetype text for txt files, since vim does not do it by default
68   - autocmd BufRead,BufNewFile *.txt setfiletype text
  78 + " Force md filetype all text-only files
  79 + " Note: Vim does not set txt as text by default
  80 + autocmd BufRead,BufNewFile *.{md,markdown,mdown,mkd,mkdn,txt} setf markdown
69 81
70 82 " Keep text files pretty and clean
71   - autocmd FileType text setlocal textwidth=78 wrap nolinebreak
  83 + autocmd FileType text,markdown,gitcommit setlocal wrap fo+=t
72 84
73 85 " Syntax of these languages is fussy over tabs Vs spaces
74 86 autocmd FileType make setlocal ts=8 sts=8 sw=8 noexpandtab
@@ -125,6 +137,10 @@ endif
125 137
126 138 " Key mappings
127 139 let mapleader = ","
  140 +
  141 +" Easy formatting, useful with text files
  142 +map Q gq
  143 +
128 144 " Map to strip white spaces
129 145 nnoremap <silent> rt :call <SID>StripTrailingWhitespaces()<CR>
130 146
@@ -167,3 +183,8 @@ function! InsertTabWrapper()
167 183 endfunction
168 184
169 185 inoremap <tab> <c-r>=InsertTabWrapper()<cr>
  186 +
  187 +" Autoload local .vimrc files
  188 +if filereadable(expand("./.vimrc.local"))
  189 + source .vimrc.local
  190 +endif

No commit comments for this range

Something went wrong with that request. Please try again.