More changes to meltdown to better integrate out-of-the-box

3 files changed, 31 insertions, 10 deletions

diff --git a/lua/lualine/themes/meltdown.lua b/lua/lualine/themes/meltdown.lua
index 215e32b..b1c5e27 100644
--- a/lua/lualine/themes/meltdown.lua
+++ b/lua/lualine/themes/meltdown.lua
@@ -11,31 +11,31 @@ return {
   normal = {
     a = {bg = n_flip, fg = colors.midnight, gui = 'bold'},
     b = {bg = colors.midnight, fg = n_flip},
-    c = {bg = colors.bg_1, fg = colors.gold_1}
+    c = {bg = colors.bg_1, fg = colors.light_yellow, bold = true}
   },
   insert = {
     a = {bg = i_flip, fg = colors.black, gui = 'bold'},
     b = {bg = colors.midnight, fg = i_flip},
-    c = {bg = colors.bg_1, fg = colors.gold_1}
+    c = {bg = colors.bg_1, fg = colors.light_yellow, bold = true}
   },
   visual = {
     a = {bg = v_flip, fg = colors.midnight, gui = 'bold'},
     b = {bg = colors.midnight, fg = v_flip},
-    c = {bg = colors.bg_1, fg = colors.gold_1}
+    c = {bg = colors.bg_1, fg = colors.light_yellow, bold = true}
   },
   replace = {
     a = {bg = r_flip, fg = colors.midnight, gui = 'bold'},
     b = {bg = colors.midnight, fg = r_flip},
-    c = {bg = colors.bg_1, fg = colors.gold_1}
+    c = {bg = colors.bg_1, fg = colors.light_yellow, bold = true}
   },
   command = {
     a = {bg = c_flip, fg = colors.midnight, gui = 'bold'},
     b = {bg = colors.midnight, fg = c_flip},
-    c = {bg = colors.bg_1, fg = colors.gold_1}
+    c = {bg = colors.bg_1, fg = colors.light_yellow, bold = true}
   },
   inactive = {
     a = {bg = n_flip, fg = colors.midnight, gui = 'bold'},
     b = {bg = colors.midnight, fg = n_flip},
-    c = {bg = colors.bg_1, fg = colors.gold_1}
+    c = {bg = colors.bg_1, fg = colors.light_yellow, bold = true}
   }
 }
diff --git a/lua/meltdown.lua b/lua/meltdown.lua
index 403f9ca..a21b92e 100644
--- a/lua/meltdown.lua
+++ b/lua/meltdown.lua
@@ -2,6 +2,19 @@ local vim = assert(vim)
 
 local meltdown = {}
 
+function meltdown.remove_package(str)
+  for k, _ in pairs(package.loaded) do
+    if string.match(k, "^" .. str) then
+      package.loaded[k] = nil
+    end
+  end
+end
+
+function meltdown.reload_package(str)
+  meltdown.remove_package(str)
+  return require(str)
+end
+
 meltdown.colors = {
   bg_0 = "#16161D",
   bg_1 = "#181820",
diff --git a/lua/meltdown/highlights.lua b/lua/meltdown/highlights.lua
index a977007..b0af0d5 100644
--- a/lua/meltdown/highlights.lua
+++ b/lua/meltdown/highlights.lua
@@ -15,6 +15,7 @@ local function highlights(colors)
     ["VertSplit"] = { fg = colors.black, bg = borders},
     ["WinSeparator"] = { fg = colors.black, bg = borders},
     ["Normal"] = { fg = colors.normal_fg, bg = colors.bg_3 },
+    ["DarkFg"] = { fg = colors.bg_3, bg = colors.bg_1 },
     ["DarkGray"] = { fg = colors.dark_grey  },
     ["StatusLine"] = { fg = colors.red, bg = borders, bold = true },
     ["Title"] = { fg = colors.orange, bg = colors.lighter_grey, bold = true  },
@@ -148,11 +149,12 @@ local function highlights(colors)
     ["DiagnosticUnderlineError"] = { sp = colors.pink, undercurl = true },
     ["DiagnosticUnderlineWarn"] = { sp = colors.light_yellow, undercurl = true },
     ["DiagnosticUnderlineInfo"] = { sp = colors.teal_2, undercurl = true },
-    ["WarpNormal"] = { fg = colors.black, bg = colors.salmon, bold = true },
-    ["TelescopeNormal"] = { fg = colors.salmon, bg =  colors.bg_1},
-    ["TelescopeSelection"] = { fg = colors.black, bg = colors.salmon },
-    ["TelescopeTitle"] = { fg = colors.salmon, bold = true },
+    ["WarpNormal"] = { fg = colors.black, bg = colors.gold_1, bold = true },
+    ["TelescopeNormal"] = { fg = colors.light_yellow, bg =  colors.bg_3},
+    ["TelescopeSelection"] = { fg = colors.black, bg = colors.gold_1 },
+    ["TelescopeTitle"] = { fg = colors.gold_1, bold = true },
     ["TelescopeMatching"] = { reverse = true },
+    ["TelescopeBorder"] = { bg = colors.bg_1 },
     ["vimMapRhs"] = { fg = colors.magenta },
     ["vimMapRhsExtend"] = { fg = colors.magenta },
     ["Delimiter"] = { fg = colors.blue },
@@ -193,6 +195,12 @@ local function highlights(colors)
     ["htmlTag"] = { fg = colors.purple},
     ["Operator"] = { fg = colors.blue },
     ["Special"] = { fg = colors.gold_5},
+    ["NonText"] = { fg = colors.salmon },
+    ["ColorColumnLine"] = { fg = colors.bg_1, bold = true },
+
+    ["LuaLineDiffAdd"] = {fg = colors.radioactive_green},
+    ["LuaLineDiffChange"] = {fg = colors.light_yellow},
+    ["LuaLineDiffDelete"] = {fg = colors.salmon},
   }
 end