fix!: remove popup, add plugins, fix user config not saving and more

README.md

@@ -74,7 +74,6 @@ require("astrotheme").setup({
     transparent = false,         -- Bool value, toggles transparency.
     inactive = true,             -- Bool value, toggles inactive window color.
     float = true,                -- Bool value, toggles floating windows background colors.
-    popup = true,                -- Bool value, toggles popup background color.
     neotree = true,              -- Bool value, toggles neo-trees background color.
     border = true,               -- Bool value, toggles borders.
     title_invert = true,         -- Bool value, swaps text and background colors.
@@ -176,7 +175,6 @@ ui.base
 ui.inactive_base
 ui.statusline
 ui.split
-ui.popup
 ui.float
 ui.title
 ui.border
@@ -191,6 +189,8 @@ ui.text_active
 ui.text_inactive
 ui.text_match
 
+ui.prompt
+
 --------------------------------
 --- terminal
 --------------------------------

doc/astrotheme.txt

@@ -57,7 +57,6 @@ OPTIONS                                                   *astrotheme-options*
         transparent = false,         -- Bool value, toggles transparency.
         inactive = true,             -- Bool value, toggles inactive window color.
         float = true,                -- Bool value, toggles floating windows background colors.
-        popup = true,                -- Bool value, toggles popup background color.
         neotree = true,              -- Bool value, toggles neo-trees background color.
         border = true,               -- Bool value, toggles borders.
         title_invert = true,         -- Bool value, swaps text and background colors.
@@ -159,7 +158,6 @@ modifiable palette names ~
     ui.inactive_base
     ui.statusline
     ui.split
-    ui.popup
     ui.float
     ui.title
     ui.border

extras/wezterm/wezterm_astrodark.lua

@@ -41,20 +41,22 @@ c.ui.base = "#1A1D23"
 c.ui.inactive_base = "#16181D"
 c.ui.statusline = "#111317"
 c.ui.split = "#111317"
-c.ui.popup = "#16181D"
-c.ui.float = "#16181D"
+c.ui.float = "#14161B"
 c.ui.title = c.ui.accent
-c.ui.border = "#7A7C7E"
+c.ui.border = "#3A3E47"
 c.ui.current_line = "#1E222A"
 c.ui.scrollbar = c.ui.accent
 c.ui.selection = "#26343F"
 c.ui.menu_selection = c.ui.accent
-c.ui.highlight = "#1E222A"
+c.ui.highlight = "#23272F"
 c.ui.none_text = "#3A3E47"
 c.ui.text = "#9B9FA9"
 c.ui.text_active = "#ADB0BB"
 c.ui.text_inactive = "#494D56"
-c.ui.text_match = c.ui.accent
+c.ui.text_match = "#E0E0Ee"
+
+c.ui.prompt = "#21242A"
+c.ui.results = "#131519"
 
 --------------------------------
 --- Terminal

lua/astrotheme/groups/base.lua

@@ -18,43 +18,34 @@ local function callback(opts)
     FloatTitle = {
       fg = (opts.title_invert and C.ui.tool) or C.ui.title,
       bg = (opts.title_invert and C.ui.title)
+        or (opts.inactive and C.ui.float)
+        or (opts.transparent and opts.float and C.ui.base)
         or (opts.float and C.ui.float)
         or (opts.transparent and C.none)
         or C.ui.base,
       blend = vim.o.winblend or 0,
       bold = true,
     },
     FloatBorder = {
-      fg = (opts.border and opts.float and C.ui.border) or (opts.float and C.ui.float) or C.ui.base,
-      bg = (opts.float and C.ui.float) or (opts.transparent and C.none) or C.ui.base,
+      fg = (opts.border and opts.float and C.ui.border)
+        or (opts.transparent and opts.float and C.ui.base)
+        or (opts.float and C.ui.float)
+        or C.ui.base,
+      bg = (opts.inactive and C.ui.float)
+        or (opts.transparent and opts.float and C.ui.base)
+        or (opts.float and C.ui.float)
+        or (opts.transparent and C.none)
+        or C.ui.base,
       blend = vim.o.winblend or 0,
     },
     NormalFloat = {
       fg = C.ui.text,
-      bg = (opts.float and C.ui.float) or (opts.transparent and C.none) or C.ui.base,
-    },
-
-    --------------------
-    --- Popup
-    --------------------
-    PopupTitle = {
-      fg = (opts.title_invert and C.ui.tool) or C.ui.title,
-      bg = (opts.title_invert and C.ui.title)
-        or (opts.inactive and C.ui.base)
-        or (opts.popup and C.ui.popup)
+      bg = (opts.inactive and C.ui.float)
+        or (opts.transparent and opts.float and C.ui.base)
+        or (opts.float and C.ui.float)
         or (opts.transparent and C.none)
         or C.ui.base,
       blend = vim.o.winblend or 0,
-      bold = true,
-    },
-    PopupBorder = {
-      fg = (opts.border and C.ui.border) or (opts.inactive and C.ui.base) or (opts.popup and C.ui.popup) or C.ui.base,
-      bg = (opts.inactive and C.ui.base) or (opts.popup and C.ui.popup) or (opts.transparent and C.none) or C.ui.base,
-      blend = vim.o.winblend or 0,
-    },
-    NormalPopup = {
-      fg = C.ui.text,
-      bg = (opts.inactive and C.ui.base) or (opts.popup and C.ui.popup) or (opts.transparent and C.none) or C.ui.base,
     },
 
     --------------------
@@ -108,7 +99,7 @@ local function callback(opts)
     --------------------
     --- UI
     --------------------
-    Cursor = { fg = C.ui.base, bg = C.syntax.text },
+    Cursor = { fg = C.ui.base, bg = C.ui.text },
     CursorIM = { link = "Cursor" },
     lCursor = { link = "Cursor" },
 
@@ -155,20 +146,20 @@ local function callback(opts)
     --------------------
     --- Menu
     --------------------
-    Pmenu = { fg = C.ui.text, bg = C.ui.popup },
-    PmenuSel = { fg = C.none, bg = C.ui.current_line },
-    PmenuSbar = { fg = C.none, bg = C.ui.tabline },
-    PmenuThumb = { fg = C.none, bg = C.ui.scrollbar },
+    Pmenu = { fg = C.ui.text, bg = C.ui.float },
+    PmenuSel = { fg = C.ui.base, bg = C.ui.menu_selection, bold = true, blend = 0 },
+    PmenuSbar = { fg = C.none, bg = C.ui.float },
+    PmenuThumb = { fg = C.none, bg = C.ui.scrollbar, blend = 0 },
 
-    WildMenu = { fg = C.ui.base, bg = C.syntax.blue },
+    WildMenu = { fg = C.ui.base, bg = C.ui.accent },
 
     --------------------
     --- Search & Select
     --------------------
     Search = { fg = C.none, bg = C.ui.selection },
     IncSearch = { fg = C.ui.base, bg = C.ui.purple },
+    Substitute = { fg = C.ui.base, bg = C.ui.red, bold = true },
     CurSearch = { link = "IncSearch" },
-    MatchParen = { fg = C.none, bg = C.ui.highlight },
     Visual = { fg = C.none, bg = C.ui.selection },
     VisualNOS = { fg = C.ui.selection, bg = C.none },
 
@@ -177,7 +168,8 @@ local function callback(opts)
     --------------------
     CursorColumn = { fg = C.none, bg = C.ui.current_line },
     ColorColumn = { fg = C.none, bg = C.ui.current_line }, -- NOTE: Find better color
-    CursorLine = { fg = C.none, bg = C.ui.current_line },
+    CursorLine = { fg = C.none, bg = opts.transparent and C.none or C.ui.current_line },
+    MatchParen = { fg = C.ui.orange, bg = C.none, bold = true },
 
     --------------------
     --- Spell

lua/astrotheme/groups/plugins/init.lua

@@ -20,7 +20,9 @@ return {
   ["nvim-web-devicons"] = "nvim-web-devicons",
   ["nvim-window-picker"] = "nvim-window-picker",
   ["mason.nvim"] = "mason",
+  ["mini.starter"] = "ministarter",
   ["rainbow-delimiters.nvim"] = "rainbow-delimiters",
+  ["spotlight.nvim"] = "spotlight",
   ["symbols-outline.nvim"] = "symbols-outline",
   ["telescope.nvim"] = "telescope",
   ["vimwiki"] = "vimwiki",

lua/astrotheme/groups/plugins/lazy.lua

@@ -3,7 +3,7 @@ local function callback()
     LazyH1 = { fg = C.ui.base, bg = C.ui.accent, bold = true }, -- home button
     LazyH2 = { fg = C.ui.accent, bold = true }, -- titles
     LazyComment = { link = "Comment" },
-    LazyNormal = { link = "NormalPopup" },
+    LazyNormal = { link = "NormalFloat" },
     LazyCommit = { fg = C.ui.text_inactive, bold = true }, -- commit ref
     LazyCommitIssue = { fg = C.ui.yellow },
     LazyCommitType = { fg = C.ui.accent, bold = true }, -- conventional commit type

lua/astrotheme/groups/plugins/mason.lua

@@ -1,7 +1,7 @@
 local function callback()
   return {
-    MasonNormal = { link = "NormalPopup" },
-    MasonHeader = { link = "PopupTitle" },
+    MasonNormal = { link = "NormalFloat" },
+    MasonHeader = { link = "FloatTitle" },
     MasonHeaderSecondary = { bold = true, fg = C.ui.base, bg = C.ui.blue },
 
     MasonHighlight = { fg = C.ui.blue },

lua/astrotheme/groups/plugins/ministarter.lua

@@ -0,0 +1,15 @@
+local function callback()
+  return {
+    MiniStarterItem = { fg = C.ui.text },
+    MiniStarterQuery = { fg = C.ui.green, bold = true },
+    MiniStarterHeader = { fg = C.ui.accent, bg = C.none },
+    MiniStarterFooter = { fg = C.ui.accent, bg = C.none },
+    MiniStarterCurrent = { fg = C.ui.text_active, underline = true, bold = true },
+    MiniStarterSection = { fg = C.ui.accent, bold = true },
+    MiniStarterInactive = { fg = C.ui.text_inactive },
+    MiniStarterItemBullet = { fg = C.ui.accent },
+    MiniStarterItemPrefix = { fg = C.ui.yellow },
+  }
+end
+
+return callback

lua/astrotheme/groups/plugins/neo-tree.lua

@@ -1,18 +1,36 @@
 local function callback(opts)
   return {
     NeoTreeDirectoryIcon = { fg = C.ui.blue },
-    NeoTreeRootName = { fg = C.ui.text, bold = true },
+    NeoTreeRootName = { fg = C.ui.text_active, bold = true },
     NeoTreeFileName = { fg = C.ui.text },
     NeoTreeFileIcon = { fg = C.ui.text },
     NeoTreeFileNameOpened = { fg = C.ui.green },
-    NeoTreeFloatBorder = { fg = C.ui.border },
-    NeoTreeFloatTitle = { fg = C.ui.title, bg = C.ui.tool },
+    NeoTreeFloatBorder = { fg = C.ui.float },
+    NeoTreeFloatTitle = {
+      fg = opts.title_invert and C.ui.tool or C.ui.title,
+      bg = opts.title_invert and opts.title or C.ui.tool,
+      bold = true,
+    },
     NeoTreeIndentMarker = { fg = C.ui.none_text },
+
     NeoTreeGitAdded = { fg = C.ui.green },
     NeoTreeGitConflict = { fg = C.ui.red },
+    NeoTreeGitDeleted = { fg = C.ui.text_inactive },
+    NeoTreeGitIgnored = { fg = C.ui.text },
     NeoTreeGitModified = { fg = C.ui.orange },
+    NeoTreeGitRenamed = { fg = C.ui.orange },
+    NeoTreeGitStaged = { fg = C.ui.cyan },
     NeoTreeGitUntracked = { fg = C.ui.yellow },
-    NeoTreeTitleBar = { fg = C.ui.tool, bg = C.ui.border },
+    NeoTreeGitUnstaged = { fg = C.ui.yellow },
+
+    NeoTreeTitleBar = {
+      fg = opts.title_invert and C.ui.tool or C.ui.title,
+      bg = (opts.title_invert and C.ui.title)
+        or (opts.neotree and C.ui.tool)
+        or (opts.transparent and C.none)
+        or C.ui.base,
+      bold = true,
+    },
     NeoTreeNormal = {
       fg = C.ui.text,
       bg = (opts.neotree and C.ui.tool) or (opts.transparent and C.none) or C.ui.base,
@@ -32,6 +50,7 @@ local function callback(opts)
     NeoTreeTabSeparatorInactive = { fg = C.ui.tabline, bg = C.ui.tabline },
     NeoTreeVertSplit = { fg = C.ui.split, bg = opts.transparent and C.none or C.ui.base },
     NeoTreeWinSeparator = { fg = C.ui.split, bg = opts.transparent and C.none or C.ui.base, bold = true },
+    NeoTreeCursorLine = { link = "PmenuSel" },
   }
 end
 

lua/astrotheme/groups/plugins/nvim-cmp.lua

@@ -2,8 +2,8 @@ local function callback()
   return {
     CmpItemAbbr = { fg = C.ui.text },
     CmpItemAbbrDeprecated = { fg = C.syntax.red, strikethrough = true },
-    CmpItemAbbrMatch = { fg = C.ui.accent },
-    CmpItemAbbrMatchFuzzy = { fg = C.ui.accent },
+    CmpItemAbbrMatch = { fg = C.ui.text_match, bold = true },
+    CmpItemAbbrMatchFuzzy = { fg = C.ui.text_match, bold = true },
     CmpItemKind = { fg = C.syntax.yellow },
     CmpItemKindClass = { link = "@type" },
     CmpItemKindColor = { link = "@constant" },

lua/astrotheme/groups/plugins/nvim-notify.lua

@@ -1,28 +1,38 @@
-local function callback()
+local function callback(opts)
+  local bg = (opts.transparent and C.none) or C.ui.tool
+
   return {
-    NotifyBackground = { bg = C.ui.base },
-    NotifyERRORBorder = { fg = C.ui.red },
-    NotifyWARNBorder = { fg = C.ui.orange },
-    NotifyINFOBorder = { fg = C.ui.green },
-    NotifyDEBUGBorder = { fg = C.ui.cyan },
-    NotifyTRACERBorder = { fg = C.ui.purple },
-    NotifyERRORIcon = { fg = C.ui.red },
-    NotifyWARNIcon = { fg = C.ui.orange },
-    NotifyINFOIcon = { fg = C.ui.green },
-    NotifyDEBUGIcon = { fg = C.ui.cyan },
-    NotifyTRACEIcon = { fg = C.ui.purple },
-    NotifyERRORTitle = { fg = C.ui.red },
-    NotifyWARNTitle = { fg = C.ui.orange },
-    NotifyINFOTitle = { fg = C.ui.green },
-    NotifyDEBUGTitle = { fg = C.ui.cyan },
-    NotifyTRACETitle = { fg = C.ui.purple },
-    NotifyERRORBody = { fg = C.ui.text },
-    NotifyWARNBody = { fg = C.ui.text },
-    NotifyINFOBody = { fg = C.ui.text },
-    NotifyDEBUGBody = { fg = C.ui.text },
-    NotifyTRACEBody = { fg = C.ui.text },
-    NotifyLogTime = { fg = C.ui.text_inactive },
-    NotifyLogTitle = { fg = C.ui.blue },
+    NotifyBackground = {
+      fg = C.ui.text,
+      bg = C.ui.base,
+    },
+
+    NotifyERRORBorder = { fg = C.ui.red, bg = bg },
+    NotifyWARNBorder = { fg = C.ui.orange, bg = bg },
+    NotifyINFOBorder = { fg = C.ui.green, bg = bg },
+    NotifyDEBUGBorder = { fg = C.ui.cyan, bg = bg },
+    NotifyTRACERBorder = { fg = C.ui.purple, bg = bg },
+
+    NotifyERRORIcon = { fg = C.ui.red, bg = bg },
+    NotifyWARNIcon = { fg = C.ui.orange, bg = bg },
+    NotifyINFOIcon = { fg = C.ui.green, bg = bg },
+    NotifyDEBUGIcon = { fg = C.ui.cyan, bg = bg },
+    NotifyTRACEIcon = { fg = C.ui.purple, bg = bg },
+
+    NotifyERRORTitle = { fg = C.ui.red, bg = bg },
+    NotifyWARNTitle = { fg = C.ui.orange, bg = bg },
+    NotifyINFOTitle = { fg = C.ui.green, bg = bg },
+    NotifyDEBUGTitle = { fg = C.ui.cyan, bg = bg },
+    NotifyTRACETitle = { fg = C.ui.purple, bg = bg },
+
+    NotifyERRORBody = { fg = C.ui.text, bg = bg },
+    NotifyWARNBody = { fg = C.ui.text, bg = bg },
+    NotifyINFOBody = { fg = C.ui.text, bg = bg },
+    NotifyDEBUGBody = { fg = C.ui.text, bg = bg },
+    NotifyTRACEBody = { fg = C.ui.text, bg = bg },
+
+    NotifyLogTime = { fg = C.ui.text_inactive, bg = bg },
+    NotifyLogTitle = { fg = C.ui.blue, bg = bg },
   }
 end
 

lua/astrotheme/groups/plugins/spotlight.lua

@@ -0,0 +1,35 @@
+local function callback(opts)
+  local bg = (opts.float and C.ui.base) or (opts.transparent and C.none) or C.ui.base
+  local blend = vim.o.winblend or 0
+
+  return {
+    SpotlightTitle = {
+      fg = (opts.title_invert and C.ui.base) or C.ui.title,
+      bg = (opts.title_invert and C.ui.title) or (opts.transparent and C.none) or C.ui.base,
+      blend = opts.title_invert and 0 or vim.o.winblend or 0,
+      bold = true,
+    },
+    SpotlightBorder = {
+      fg = opts.border and C.ui.border or C.ui.base,
+      bg = bg,
+      blend = blend,
+    },
+    SpotlightNormal = {
+      fg = C.ui.text,
+      bg = bg,
+      blend = blend,
+    },
+    SpotlightWinSeparator = {
+      fg = C.ui.inactive_base,
+      bg = opts.transparent and C.none or C.ui.inactive_base,
+      blend = blend,
+    },
+    SpotlightNormalNC = {
+      fg = C.syntax.text,
+      bg = opts.transparent and C.none or C.ui.inactive_base,
+      -- blend = blend,
+    },
+  }
+end
+
+return callback