clean: rm useless integrations

NvChad · Oct 29, 2024 · 3d15830 · 3d15830
1 parent fec9fa5
commit 3d15830
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 235 deletions.
diff --git a/lua/base46/init.lua b/lua/base46/init.lua
@@ -12,7 +12,6 @@ local integrations = {
   "lsp",
   "mason",
   "nvcheatsheet",
-  "nvdash",
   "nvimtree",
   "statusline",
   "syntax",

diff --git a/lua/base46/integrations/defaults.lua b/lua/base46/integrations/defaults.lua
@@ -1,227 +1,64 @@
 local colors = require("base46").get_theme_tb "base_30"
 local theme = require("base46").get_theme_tb "base_16"
-
-local generate_color = require("base46.colors").change_hex_lightness
+local lighten = require("base46.colors").change_hex_lightness
 
 local defaults = {
   Added = { fg = colors.green },
   Removed = { fg = colors.red },
   Changed = { fg = colors.yellow },
-
-  MatchWord = {
-    bg = colors.grey,
-    fg = colors.white,
-  },
-
+  MatchWord = { bg = colors.grey, fg = colors.white },
   Pmenu = { bg = colors.one_bg },
   PmenuSbar = { bg = colors.one_bg },
   PmenuSel = { bg = colors.pmenu_bg, fg = colors.black },
   PmenuThumb = { bg = colors.grey },
-
   MatchParen = { link = "MatchWord" },
-
-  Comment = { fg = colors.grey_fg },
-
+  Comment = { fg = colors.light_grey },
   CursorLineNr = { fg = colors.white },
   LineNr = { fg = colors.grey },
-
-  -- floating windows
   FloatBorder = { fg = colors.blue },
   FloatTitle = { fg = colors.white, bg = colors.grey },
   NormalFloat = { bg = colors.darker_black },
-
   NvimInternalError = { fg = colors.red },
   WinSeparator = { fg = colors.line },
-
-  Normal = {
-    fg = theme.base05,
-    bg = theme.base00,
-  },
-
+  Normal = { fg = theme.base05, bg = theme.base00 },
   DevIconDefault = { fg = colors.red },
-
-  Bold = {
-    bold = true,
-  },
-
-  Debug = {
-    fg = theme.base08,
-  },
-
-  Directory = {
-    fg = theme.base0D,
-  },
-
-  Error = {
-    fg = theme.base00,
-    bg = theme.base08,
-  },
-
-  ErrorMsg = {
-    fg = theme.base08,
-    bg = theme.base00,
-  },
-
-  Exception = {
-    fg = theme.base08,
-  },
-
+  Debug = { fg = theme.base08 },
+  Directory = { fg = theme.base0D },
+  Error = { fg = theme.base00, bg = theme.base08 },
+  ErrorMsg = { fg = theme.base08, bg = theme.base00 },
+  Exception = { fg = theme.base08 },
   FoldColumn = { bg = "none" },
-
-  Folded = {
-    fg = colors.light_grey,
-    bg = colors.black2,
-  },
-
-  IncSearch = {
-    fg = theme.base01,
-    bg = theme.base09,
-  },
-
-  Italic = {
-    italic = true,
-  },
-
-  Macro = {
-    fg = theme.base08,
-  },
-
-  ModeMsg = {
-    fg = theme.base0B,
-  },
-
-  MoreMsg = {
-    fg = theme.base0B,
-  },
-
-  Question = {
-    fg = theme.base0D,
-  },
-
-  Search = {
-    fg = theme.base01,
-    bg = theme.base0A,
-  },
-
-  Substitute = {
-    fg = theme.base01,
-    bg = theme.base0A,
-    sp = "none",
-  },
-
-  SpecialKey = {
-    fg = theme.base03,
-  },
-
-  TooLong = {
-    fg = theme.base08,
-  },
-
-  UnderLined = {
-    underline = true,
-  },
-
-  Visual = {
-    bg = theme.base02,
-  },
-
-  VisualNOS = {
-    fg = theme.base08,
-  },
-
-  WarningMsg = {
-    fg = theme.base08,
-  },
-
-  WildMenu = {
-    fg = theme.base08,
-    bg = theme.base0A,
-  },
-
-  Title = {
-    fg = theme.base0D,
-    sp = "none",
-  },
-
-  Conceal = {
-    bg = "NONE",
-  },
-
-  Cursor = {
-    fg = theme.base00,
-    bg = theme.base05,
-  },
-
-  NonText = {
-    fg = theme.base03,
-  },
-
-  SignColumn = {
-    fg = theme.base03,
-    sp = "NONE",
-  },
-
-  ColorColumn = {
-    bg = colors.black2,
-  },
-
-  CursorColumn = {
-    bg = theme.base01,
-    sp = "none",
-  },
-
-  CursorLine = {
-    bg = colors.black2,
-  },
-
-  QuickFixLine = {
-    bg = theme.base01,
-    sp = "none",
-  },
-
-  -- spell
-  SpellBad = {
-    undercurl = true,
-    sp = theme.base08,
-  },
-
-  SpellLocal = {
-    undercurl = true,
-    sp = theme.base0C,
-  },
-
-  SpellCap = {
-    undercurl = true,
-    sp = theme.base0D,
-  },
-
-  SpellRare = {
-    undercurl = true,
-    sp = theme.base0E,
-  },
-
-  healthSuccess = {
-    bg = colors.green,
-    fg = colors.black,
-  },
+  Folded = { fg = colors.light_grey, bg = colors.black2 },
+  IncSearch = { fg = theme.base01, bg = theme.base09 },
+  Macro = { fg = theme.base08 },
+  ModeMsg = { fg = theme.base0B },
+  MoreMsg = { fg = theme.base0B },
+  Question = { fg = theme.base0D },
+  Search = { fg = theme.base01, bg = theme.base0A },
+  Substitute = { fg = theme.base01, bg = theme.base0A },
+  SpecialKey = { fg = theme.base03 },
+  TooLong = { fg = theme.base08 },
+  Visual = { bg = theme.base02 },
+  VisualNOS = { fg = theme.base08 },
+  WarningMsg = { fg = theme.base08 },
+  WildMenu = { fg = theme.base08, bg = theme.base0A },
+  Title = { fg = theme.base0D },
+  Conceal = { bg = "NONE" },
+  Cursor = { fg = theme.base00, bg = theme.base05 },
+  NonText = { fg = theme.base03 },
+  SignColumn = { fg = theme.base03 },
+  ColorColumn = { bg = colors.black2 },
+  CursorColumn = { bg = theme.base01 },
+  CursorLine = { bg = colors.black2 },
+  QuickFixLine = { bg = theme.base01 },
+  healthSuccess = { bg = colors.green, fg = colors.black },
+  WinBar = { bg = "NONE" },
+  WinBarNC = { bg = "NONE" },
 
   -- lazy.nvim
-  LazyH1 = {
-    bg = colors.green,
-    fg = colors.black,
-  },
-
-  LazyButton = {
-    bg = colors.one_bg,
-    fg = generate_color(colors.light_grey, vim.o.bg == "dark" and 10 or -20),
-  },
-
-  LazyH2 = {
-    fg = colors.red,
-    bold = true,
-    underline = true,
-  },
-
+  LazyH1 = { bg = colors.green, fg = colors.black },
+  LazyButton = { bg = colors.one_bg, fg = lighten(colors.light_grey, vim.o.bg == "dark" and 10 or -20) },
+  LazyH2 = { fg = colors.red, bold = true, underline = true },
   LazyReasonPlugin = { fg = colors.red },
   LazyValue = { fg = colors.teal },
   LazyDir = { fg = theme.base05 },
@@ -241,19 +78,9 @@ local defaults = {
   LazyReasonSource = { fg = colors.cyan },
   LazyReasonImport = { fg = colors.white },
   LazyProgressDone = { fg = colors.green },
-
-  WinBar = { bg = "NONE" },
-  WinBarNC = { bg = "NONE" },
 }
 
 -- merge statusline & hl_add tables!
 local merge_tb = require("base46").merge_tb
-local nvconfig = require "nvconfig"
-local user_new_highlights = nvconfig.ui.hl_add or nvconfig.base46.hl_add
-
-if user_new_highlights then
-  local hexify_ColorStrs = require("base46").turn_str_to_color
-  defaults = merge_tb(defaults, hexify_ColorStrs(user_new_highlights))
-end
-
-return defaults
+local hexify_ColorStrs = require("base46").turn_str_to_color
+return merge_tb(defaults, hexify_ColorStrs(require("nvconfig").base46.hl_add))
diff --git a/lua/base46/integrations/lsp.lua b/lua/base46/integrations/lsp.lua
@@ -14,9 +14,6 @@ return {
   DiagnosticInfo = { fg = colors.green },
   LspSignatureActiveParameter = { fg = colors.black, bg = colors.green },
 
-  RenamerTitle = { fg = colors.black, bg = colors.red },
-  RenamerBorder = { fg = colors.red },
-
   LspInlayHint = {
     bg = colorize(colors.black2, vim.o.bg == "dark" and 0 or 3),
     fg = colors.light_grey,

diff --git a/lua/base46/integrations/nvdash.lua b/lua/base46/integrations/nvdash.lua