From f35b13d669867209427449840ff0930a732591dc Mon Sep 17 00:00:00 2001 From: Squibid Date: Fri, 24 Nov 2023 21:38:31 -0500 Subject: more stuff too lazy to seperate --- colors/mellow+.lua | 73 ------------------------------------------- colors/mellow.ext.lua | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 73 deletions(-) delete mode 100644 colors/mellow+.lua create mode 100644 colors/mellow.ext.lua (limited to 'colors') diff --git a/colors/mellow+.lua b/colors/mellow+.lua deleted file mode 100644 index e089bfc..0000000 --- a/colors/mellow+.lua +++ /dev/null @@ -1,73 +0,0 @@ -vim.cmd('runtime mellow') -local highlight = function(group, opts, space) - space = space or 0 - - if type(group) == 'table' then - for i in pairs(group) do - a.nvim_set_hl(space, group[i], opts) - end - elseif type(group) == 'string' then - a.nvim_set_hl(space, group, opts) - end -end - -local function getcolor(index, fallback) - return vim.g['terminal_color_' .. index] or fallback -end - -local colors = { - black = getcolor(0, 'Black'), - red = getcolor(1, 'Red'), - green = getcolor(2, 'Green'), - yellow = getcolor(3, 'Yellow'), - blue = getcolor(4, 'Blue'), - magenta = getcolor(5, 'Magenta'), - cyan = getcolor(6, 'Cyan'), - white = getcolor(7, 'White'), - bright_black = getcolor(8, 'DarkGrey'), - bright_red = getcolor(9, 'LightRed'), - bright_green = getcolor(10, 'LightGreen'), - bright_yellow = getcolor(11, 'LightYellow'), - bright_blue = getcolor(12, 'LightBlue'), - bright_magenta = getcolor(13, 'LightMagenta'), - bright_cyan = getcolor(14, 'LightCyan'), - bright_white = getcolor(15, 'LightGray'), -} - -if pcall(require, "mellow") then c = require('mellow.colors').dark end - --- vim highlights ------------------------------------------------------------- -highlight('CursorLineNr', { bold = true }) - --- remove tildas -highlight('EndOfBuffer', { fg = vim.g.terminal_color_background }) - --- plugin highlights ---------------------------------------------------------- --- telescope -highlight('TelescopeMatching', { bg = c.gray01 }) -highlight('TelescopeNormal', { bg = c.bg_dark }) - -highlight('TelescopePreviewBorder', { bg = c.bg_dark }) -highlight('TelescopePreviewNormal', { bg = c.bg_dark }) -highlight('TelescopePreviewTitle', { bg = c.bg_dark, fg = c.bg_dark }) - -highlight('TelescopePromptBorder', { bg = c.gray01 }) -highlight('TelescopePromptNormal', { bg = c.gray01 }) -highlight('TelescopePromptPrefix', { bg = c.gray01 }) -highlight('TelescopePromptTitle', { bg = c.gray01 }) - -highlight('TelescopeResultsBorder', { bg = c.bg_dark }) -highlight('TelescopeResultsNormal', { bg = c.bg_dark }) -highlight('TelescopeResultsTitle', { bg = c.bg_dark, fg = c.bg_dark }) - -highlight('TelescopeSelection', { bg = vim.g.terminal_color_background }) -highlight('TelescopeSelectionCaret', { bg = vim.g.terminal_color_background, fg = c.red}) - --- alpha -highlight('AlphaHeader', { fg = colors.blue }) -highlight('AlphaText', { fg = colors.blue }) -highlight('AlphaShortcut', { bold = true }) -highlight('AlphaFooter', { fg = colors.blue }) - --- fidget -highlight('FidgetTask', { fg = vim.g.terminal_color_foreground }) diff --git a/colors/mellow.ext.lua b/colors/mellow.ext.lua new file mode 100644 index 0000000..a3080a3 --- /dev/null +++ b/colors/mellow.ext.lua @@ -0,0 +1,86 @@ +vim.cmd('runtime mellow') +local highlight = function(group, opts, space) + space = space or 0 + + if type(group) == 'table' then + for i in pairs(group) do + a.nvim_set_hl(space, group[i], opts) + end + elseif type(group) == 'string' then + a.nvim_set_hl(space, group, opts) + end +end + +local function getcolor(index, fallback) + return vim.g['terminal_color_' .. index] or fallback +end + +local colors = { + black = getcolor(0, 'Black'), + red = getcolor(1, 'Red'), + green = getcolor(2, 'Green'), + yellow = getcolor(3, 'Yellow'), + blue = getcolor(4, 'Blue'), + magenta = getcolor(5, 'Magenta'), + cyan = getcolor(6, 'Cyan'), + white = getcolor(7, 'White'), + bright_black = getcolor(8, 'DarkGrey'), + bright_red = getcolor(9, 'LightRed'), + bright_green = getcolor(10, 'LightGreen'), + bright_yellow = getcolor(11, 'LightYellow'), + bright_blue = getcolor(12, 'LightBlue'), + bright_magenta = getcolor(13, 'LightMagenta'), + bright_cyan = getcolor(14, 'LightCyan'), + bright_white = getcolor(15, 'LightGray'), +} + +if pcall(require, "mellow") then c = require('mellow.colors').dark end + +-- vim highlights ------------------------------------------------------------- +highlight('CursorLineNr', { bold = true }) + +-- remove tildas +highlight('EndOfBuffer', { fg = vim.g.terminal_color_background }) + +-- plugin highlights ---------------------------------------------------------- +-- telescope +highlight('TelescopeMatching', { bg = c.gray01, fg = c.blue }) + +highlight('TelescopePreviewBorder', { bg = c.bg_dark }) +highlight('TelescopePreviewNormal', { bg = c.bg_dark }) +highlight('TelescopePreviewTitle', { bg = c.bg_dark, fg = c.bg_dark }) + +highlight('TelescopePromptBorder', { bg = c.gray01 }) +highlight('TelescopePromptNormal', { bg = c.gray01 }) +highlight('TelescopePromptPrefix', { bg = c.gray01 }) +highlight('TelescopePromptTitle', { bg = c.gray01 }) + +highlight('TelescopeResultsBorder', { bg = c.bg_dark }) +highlight('TelescopeResultsNormal', { bg = c.bg_dark }) +highlight('TelescopeResultsTitle', { bg = c.bg_dark, fg = c.bg_dark }) + +highlight('TelescopeSelection', { bg = vim.g.terminal_color_background }) +highlight('TelescopeSelectionCaret', { bg = vim.g.terminal_color_background, fg = c.cyan, bold = true }) + +-- alpha +highlight('AlphaHeader', { fg = colors.blue }) +highlight('AlphaText', { fg = colors.blue }) +highlight('AlphaShortcut', { bold = true }) +highlight('AlphaFooter', { fg = colors.blue }) + +-- fidget +highlight('FidgetTask', { fg = vim.g.terminal_color_foreground }) + +-- norg + headings +highlight({ "@neorg.headings.1.title", "@neorg.headings.1.icon" }, + { fg = colors.yellow, bg = '#2a211c' }) +highlight({ "@neorg.headings.2.title", "@neorg.headings.2.icon" }, + { fg = colors.blue, bg = '#201e25' }) +highlight({ "@neorg.headings.3.title", "@neorg.headings.3.icon" }, + { fg = colors.cyan, bg = '#2b1b20' }) +highlight({ "@neorg.headings.4.title", "@neorg.headings.4.icon" }, + { fg = colors.green, bg = '#1d201e' }) +highlight({ "@neorg.headings.5.title", "@neorg.headings.5.icon" }, + { fg = colors.magenta, bg = '#251a21' }) +highlight({ "@neorg.headings.6.title", "@neorg.headings.6.icon" }, + { fg = colors.white, bg = '#212126' }) -- cgit v1.2.1