v3.0

lua/base46/integrations/syntax.lua

@@ -4,7 +4,7 @@ local syntax = {
   Boolean = { fg = theme.base09 },
   Character = { fg = theme.base08 },
   Conditional = { fg = theme.base0E },
-  Constant = { fg = theme.base08 },
+  Constant = { fg = theme.base09 },
   Define = { fg = theme.base0E, sp = "none" },
   Delimiter = { fg = theme.base0F },
   Float = { fg = theme.base09 },

lua/base46/integrations/treesitter.lua

@@ -1,6 +1,9 @@
 local theme = require("base46").get_theme_tb "base_16"
 local base30 = require("base46").get_theme_tb "base_30"
 
+local opts = require("nvconfig").base46
+local transparent = opts.transparent
+
 return {
 
   ["@variable"] = { fg = theme.base05 },
@@ -12,7 +15,7 @@ return {
   ["@module"] = { fg = theme.base08 },
   -- ["@module.builtin"] = { fg = theme.base08 },
 
-  ["@constant"] = { fg = theme.base08 },
+  ["@constant"] = { fg = theme.base09 },
   ["@constant.builtin"] = { fg = theme.base09 },
   ["@constant.macro"] = { fg = theme.base08 },
 
@@ -76,7 +79,7 @@ return {
   ["@markup.underline"] = { underline = true },
   ["@markup.italic"] = { italic = true },
   ["@markup.strikethrough"] = { strikethrough = true },
-  ["@markup.quote"] = { bg = base30.black2 },
+  ["@markup.quote"] = { bg = transparent and nil or base30.black2 },
 
   ["@comment"] = { fg = base30.grey_fg },
   ["@comment.todo"] = { fg = base30.grey, bg = base30.white },

lua/base46/themes/aylin.lua

@@ -0,0 +1,77 @@
+local M = {}
+
+M.base_30 = {
+  white = "#ffffff",
+  darker_black = "#1f2128",
+  black = "#24262E",
+  black2 = "#2a2d36",
+  one_bg = "#363b46",
+  one_bg2 = "#3c424e",
+  one_bg3 = "#424956",
+  grey = "#4e5766",
+  grey_fg = "#545e6e",
+  grey_fg2 = "#5a6576",
+  light_grey = "#606c7e",
+  red = "#FD98B9",
+  baby_pink = "#f45c7f",
+  pink = "#f45c7f",
+  line = "#363b46",
+  green = "#9fd54d",
+  vibrant_green = "#addb67",
+  blue = "#9fd4ff",
+  nord_blue = "#6cbeff",
+  yellow = "#becf00",
+  sun = "#ebff00",
+  purple = "#d9b6f0",
+  dark_purple = "#FD98B9",
+  teal = "#7fdbca",
+  orange = "#ecc48d",
+  cyan = "#7fdbca",
+  statusline_bg = "#2a2d36",
+  lightbg = "#363b46",
+  pmenu_bg = "#addb67",
+  folder_bg = "#7fdbca",
+  brown = "#acafb9",
+}
+
+M.base_16 = {
+  base00 = "#24262E",
+  base01 = "#2a2d36",
+  base02 = "#30343e",
+  base03 = "#363b46",
+  base04 = "#3c424e",
+  base05 = "#ebefff",
+  base06 = "#bbc8ff",
+  base07 = "#abbbff",
+  base08 = M.base_30.red,
+  base09 = "#ecc48d",
+  base0A = M.base_30.brown,
+  base0B = M.base_30.orange,
+  base0C = M.base_30.blue,
+  base0D = M.base_30.teal,
+  base0E = M.base_30.blue,
+  base0F = M.base_30.red,
+}
+
+M.type = "dark"
+
+M.polish_hl = {
+  syntax = {
+    Include = { fg = M.base_30.blue },
+    Tag = { fg = M.base_30.red },
+  },
+  treesitter = {
+    ['@tag'] = { fg = M.base_30.red },
+    ['@tag.attribute'] = { fg = M.base_30.purple },
+    ['@tag.delimiter'] = { fg = M.base_30.brown },
+    ["@keyword.function"] = { fg = M.base_30.blue },
+    ["@keyword.exception"] = { fg = M.base_30.blue },
+    ["@type.builtin"] = { fg = M.base_30.red },
+    ["@punctuation.bracket"] = { fg = M.base_30.brown },
+    ["@variable.member"] = { fg = M.base_30.brown },
+  },
+}
+
+M = require("base46").override_theme(M, "aylin")
+
+return M

lua/base46/themes/carbonfox.lua

@@ -0,0 +1,66 @@
+local M = {}
+
+M.base_30 = {
+  white = "#dfdfe0",
+  black = "#161616",
+  darker_black = "#0e0e0e",
+  black2 = "#1d1d1d",
+  one_bg = "#242424",
+  one_bg2 = "#2b2b2b",
+  one_bg3 = "#323232",
+  grey = "#404040",
+  grey_fg = "#4e4e4e",
+  grey_fg2 = "#5c5c5c",
+  light_grey = "#636363",
+  red = "#EE5396",
+  baby_pink = "#FF7EB6",
+  pink = "#FF7EB6",
+  line = "#2a2a2a",
+  green = "#25be6a",
+  vibrant_green = "#42BE65",
+  nord_blue = "#78A9FF",
+  blue = "#78A9FF",
+  yellow = "#ffe731",
+  sun = "#ffe731",
+  purple = "#BE95FF",
+  dark_purple = "#9B69D9",
+  teal = "#33B1FF",
+  orange = "#ffa332",
+  cyan = "#3DDBD9",
+  statusline_bg = "#1d1d1d",
+  lightbg = "#2b2b2b",
+  pmenu_bg = "#08BDBA",
+  folder_bg = "#78A9FF",
+}
+
+M.base_16 = {
+  base00 = "#161616",
+  base01 = "#282828",
+  base02 = "#2a2a2a",
+  base03 = "#3b3b3b",
+  base04 = "#525253",
+  base05 = "#f2f4f8",
+  base06 = "#e0e0e0",
+  base07 = "#ffffff",
+  base08 = "#78A9FF",
+  base09 = "#08BDBA",
+  base0A = "#3DDBD9",
+  base0B = "#25be6a",
+  base0C = "#33B1FF",
+  base0D = "#FF7EB6",
+  base0E = "#BE95FF",
+  base0F = "#78A9FF",
+}
+
+M.polish_hl = {
+  treesitter = {
+    ["@keyword.return"] = { fg = M.base_30.red },
+    ["@function"] = { fg = M.base_30.blue },
+  },
+}
+
+M.type = "dark"
+
+M = require("base46").override_theme(M, "carbonfox")
+
+return M

lua/base46/themes/darcula-dark.lua

@@ -0,0 +1,76 @@
+local M = {}
+
+M.base_30 = {
+  white = "#eeeeee",
+  black = "#2B2B2B",
+  darker_black = "#252525",
+  black2 = "#323232",
+  one_bg = "#393939",
+  one_bg2 = "#404040",
+  one_bg3 = "#474747",
+  grey = "#555555",
+  grey_fg = "#646464",
+  grey_fg2 = "#6b6b6b",
+  light_grey = "#727272",
+  red = "#f43753",
+  baby_pink = "#f70067",
+  pink = "#b33076",
+  line = "#4c4c4c",
+  green = "#6A8759",
+  vibrant_green = "#98be65",
+  nord_blue = "#6897BB",
+  blue = "#6FAFBD",
+  yellow = "#ffc24b",
+  sun = "#d3b987",
+  taupe = "#AD9E7D",
+  purple = "#9876AA",
+  dark_purple = "#b33076",
+  teal = "#6897BB",
+  orange = "#dc9656",
+  cyan = "#00f1f5",
+  statusline_bg = "#323232",
+  lightbg = "#393939",
+  pmenu_bg = "#98be65",
+  folder_bg = "#6897BB",
+  brown = "#CC7832",
+}
+
+M.base_16 = {
+  base00 = "#2B2B2B",
+  base01 = "#393939",
+  base02 = "#404040",
+  base03 = "#474747",
+  base04 = "#555555",
+  base05 = "#abb2bf",
+  base06 = "#a2aab8",
+  base07 = "#99a2b1",
+  base08 = "#C9D0D3",
+  base09 = M.base_30.purple,
+  base0A = M.base_30.orange,
+  base0B = M.base_30.green,
+  base0C = M.base_30.sun,
+  base0D = M.base_30.taupe,
+  base0E = M.base_30.sun,
+  base0F = M.base_30.brown,
+}
+
+M.polish_hl = {
+  syntax = {
+    Number = { fg = M.base_30.teal },
+    Type = { fg = M.base_30.teal },
+    Conditional = { fg = M.base_30.orange },
+    Include = { fg = M.base_30.brown },
+  },
+
+  treesitter = {
+    ["@keyword.conditional"] = { fg = M.base_30.orange },
+    ["@number"] = { fg = M.base_30.teal },
+    ["@punctuation.bracket"] = { fg = M.base_30.white },
+  },
+}
+
+M.type = "dark"
+
+M = require("base46").override_theme(M, "darcula-dark")
+
+return M

lua/base46/themes/default-dark.lua

@@ -0,0 +1,59 @@
+local M = {}
+
+M.base_30 = {
+  white = "#f8f8f8",
+  darker_black = "#101010",
+  black = "#181818", --  nvim bg
+  black2 = "#262626",
+  one_bg = "#2d2d2d",
+  one_bg2 = "#343434",
+  one_bg3 = "#3b3b3b",
+  grey = "#494949",
+  grey_fg = "#575757",
+  grey_fg2 = "#5e5e5e",
+  light_grey = "#656565",
+  red = "#ab4642",
+  baby_pink = "#d59593",
+  pink = "#e1b2b0",
+  line = "#3b3b3b", -- for lines like vertsplit
+  green = "#a1b56c",
+  vibrant_green = "#abcb56",
+  blue = "#7cafc2",
+  nord_blue = "#609eb5",
+  yellow = "#f7ca88",
+  sun = "#f8ce92",
+  purple = "#ba8baf",
+  dark_purple = "#a86c9a",
+  teal = "#6cb598",
+  orange = "#a16946",
+  cyan = "#86c1b9",
+  statusline_bg = "#212121",
+  lightbg = "#2f2f2f",
+  pmenu_bg = "#d59593",
+  folder_bg = "#7cafc2",
+}
+
+M.base_16 = {
+  base00 = "#181818",
+  base01 = "#282828",
+  base02 = "#383838",
+  base03 = "#585858",
+  base04 = "#b8b8b8",
+  base05 = "#d8d8d8",
+  base06 = "#e8e8e8",
+  base07 = "#f8f8f8",
+  base08 = "#ab4642",
+  base09 = "#dc9656",
+  base0A = "#f7ca88",
+  base0B = "#a1b56c",
+  base0C = "#86c1b9",
+  base0D = "#7cafc2",
+  base0E = "#ba8baf",
+  base0F = "#a16946",
+}
+
+M.type = "dark"
+
+M = require("base46").override_theme(M, "default-dark")
+
+return M

lua/base46/themes/default-light.lua

@@ -0,0 +1,59 @@
+local M = {}
+
+M.base_30 = {
+  white = "#181818",
+  darker_black = "#f0f0f0",
+  black = "#f8f8f8", -- nvim bg
+  black2 = "#e8e8e8",
+  one_bg = "#e0e0e0",
+  one_bg2 = "#d8d8d8",
+  one_bg3 = "#d0d0d0",
+  grey = "#c0c0c0",
+  grey_fg = "#b8b8b8",
+  grey_fg2 = "#b0b0b0",
+  light_grey = "#a8a8a8",
+  red = "#ab4642",
+  baby_pink = "#ae77a1",
+  pink = "#ae77a1",
+  line = "#d8d8d8", -- for lines like vertsplit
+  green = "#93a956",
+  vibrant_green = "#70b5ad",
+  blue = "#71a8bd",
+  nord_blue = "#71a8bd",
+  yellow = "#f1a02e",
+  sun = "#f1a02e",
+  purple = "#b481a8",
+  dark_purple = "#8b5b3c",
+  teal = "#70b5ad",
+  orange = "#d98e49",
+  cyan = "#5aa9a1",
+  statusline_bg = "#efefef",
+  lightbg = "#e0e0e0",
+  pmenu_bg = "#f5bc6a",
+  folder_bg = "#66a1b8",
+}
+
+M.base_16 = {
+  base00 = "#f8f8f8",
+  base01 = "#e8e8e8",
+  base02 = "#d8d8d8",
+  base03 = "#b8b8b8",
+  base04 = "#585858",
+  base05 = "#383838",
+  base06 = "#282828",
+  base07 = "#181818",
+  base08 = "#ab4642",
+  base09 = "#d98e49",
+  base0A = "#f1a02e",
+  base0B = "#9aaf61",
+  base0C = "#7bbbb3",
+  base0D = "#71a8bd",
+  base0E = "#b481a8",
+  base0F = "#966241",
+}
+
+M.type = "light"
+
+M = require("base46").override_theme(M, "default-light")
+
+return M