make

savq · Nov 16, 2021 · e3a3a2c · e3a3a2c
1 parent d835fd5
commit e3a3a2c
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 4 deletions.
diff --git a/colors/melange.vim b/colors/melange.vim
@@ -29,6 +29,10 @@ highlight Error guifg=NONE guibg=#7D2A2F guisp=NONE gui=NONE
 highlight ErrorMsg guifg=NONE guibg=#7D2A2F guisp=NONE gui=NONE
 highlight Folded guifg=#A38D78 guibg=#352F2A guisp=NONE gui=NONE
 highlight Function guifg=#EBC06D guibg=NONE guisp=NONE gui=NONE
+highlight GitSignsAdd guifg=#2A2520 guibg=#1F3521 guisp=NONE gui=reverse
+highlight GitSignsChange guifg=#2A2520 guibg=#462445 guisp=NONE gui=reverse
+highlight GitSignsCurrentLineBlame guifg=#2A2520 guibg=#243146 guisp=NONE gui=reverse
+highlight GitSignsDelete guifg=#2A2520 guibg=#7D2A2F guisp=NONE gui=reverse
 highlight HelpHyperTextJump guifg=#E49B5D guibg=NONE guisp=NONE gui=NONE
 highlight Identifier guifg=#ECE1D7 guibg=NONE guisp=NONE gui=NONE
 highlight Ignore guifg=#A38D78 guibg=NONE guisp=NONE gui=NONE
@@ -99,6 +103,9 @@ highlight! link PmenuSbar Pmenu
 highlight! link PmenuThumb PmenuSel
 highlight! link Question MoreMsg
 highlight! link SignColumn LineNr
+highlight! link SignifySignAdd GitSignsAdd
+highlight! link SignifySignChange GitSignsChange
+highlight! link SignifySignDelete GitSignsDelete
 highlight! link SpecialKey Whitespace
 highlight! link StatusLine NormalFloat
 highlight! link TSConstMacro Constant
@@ -154,6 +161,10 @@ highlight Error guifg=NONE guibg=#E0BFBB guisp=NONE gui=NONE
 highlight ErrorMsg guifg=NONE guibg=#E0BFBB guisp=NONE gui=NONE
 highlight Folded guifg=#A38D78 guibg=#E9E1DB guisp=NONE gui=NONE
 highlight Function guifg=#C29830 guibg=NONE guisp=NONE gui=NONE
+highlight GitSignsAdd guifg=#F4F0ED guibg=#C6ECC8 guisp=NONE gui=reverse
+highlight GitSignsChange guifg=#F4F0ED guibg=#EBDFEA guisp=NONE gui=reverse
+highlight GitSignsCurrentLineBlame guifg=#F4F0ED guibg=#DFE3EB guisp=NONE gui=reverse
+highlight GitSignsDelete guifg=#F4F0ED guibg=#E0BFBB guisp=NONE gui=reverse
 highlight HelpHyperTextJump guifg=#CC7F2B guibg=NONE guisp=NONE gui=NONE
 highlight Identifier guifg=#6B5C4D guibg=NONE guisp=NONE gui=NONE
 highlight Ignore guifg=#A38D78 guibg=NONE guisp=NONE gui=NONE
@@ -224,6 +235,9 @@ highlight! link PmenuSbar Pmenu
 highlight! link PmenuThumb PmenuSel
 highlight! link Question MoreMsg
 highlight! link SignColumn LineNr
+highlight! link SignifySignAdd GitSignsAdd
+highlight! link SignifySignChange GitSignsChange
+highlight! link SignifySignDelete GitSignsDelete
 highlight! link SpecialKey Whitespace
 highlight! link StatusLine NormalFloat
 highlight! link TSConstMacro Constant

diff --git a/lua/melange/build.lua b/lua/melange/build.lua
@@ -76,17 +76,17 @@ local function build(terminals)
         for term, attrs in pairs(terminals) do
             fwrite(
                 interpolate(attrs.template, map),
-                string.format("/term/%s/melange_%s.%s", term, l, attrs.ext)
+                string.format("/term/%s/melange_%s%s", term, l, attrs.ext)
             )
         end
     end
 end
 
 local terminals = {
-    alacritty = {ext="yml"},
-    kitty     = {ext="conf"},
+    alacritty = {ext=".yml"},
+    kitty     = {ext=".conf"},
     termite   = {ext=""},
-    wezterm   = {ext="toml"},
+    wezterm   = {ext=".toml"},
 }
 
 terminals.alacritty.template = [[

diff --git a/term/termite/melange_dark b/term/termite/melange_dark
@@ -0,0 +1,20 @@
+[colors]
+foreground = #ECE1D7
+background = #2A2520
+color0     = #352F2A
+color1     = #B65C60
+color2     = #78997A
+color3     = #EBC06D
+color4     = #9AACCE
+color5     = #B380B0
+color6     = #86A3A3
+color7     = #A38D78
+color8     = #4D453E
+color9     = #F17C64
+color10    = #99D59D
+color11    = #EBC06D
+color12    = #9AACCE
+color13    = #CE9BCB
+color14    = #88B3B2
+color15    = #C1A78E
+highlight  = nil
diff --git a/term/termite/melange_light b/term/termite/melange_light
@@ -0,0 +1,20 @@
+[colors]
+foreground = #6B5C4D
+background = #F4F0ED
+color0     = #E9E1DB
+color1     = #D7898C
+color2     = #83B887
+color3     = #C29830
+color4     = #485F84
+color5     = #BE79BB
+color6     = #729893
+color7     = #A38D78
+color8     = #DED2C8
+color9     = #C65333
+color10    = #659E69
+color11    = #C29830
+color12    = #485F84
+color13    = #854882
+color14    = #436460
+color15    = #867462
+highlight  = nil