From 782fb79f507ff249c4781cb0f1918cc6ef6819e9 Mon Sep 17 00:00:00 2001 From: max miliano Date: Fri, 23 Feb 2024 13:52:27 -0300 Subject: [PATCH] feat: mini,hop,inlay_hint --- README.md | 4 ++ dracula-soft.yml | 89 ++++++++++++++++++++++++++++++++- dracula.yml | 85 +++++++++++++++++++++++++++++++ lua/dracula/config.lua | 4 ++ lua/dracula/highlights/init.lua | 76 ++++++++++++++++++++++++++++ lua/dracula/palette/init.lua | 2 + 6 files changed, 258 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b410359..2816bde 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,10 @@ return { ["lazy.nvim"] = true, ["telescope.nvim"] = true, ["noice.nvim"] = true, + ["hop.nvim"] = true, + ["mini.statusline"] = true, + ["mini.tabline"] = true, + ["mini.starter"] = true, } }) vim.cmd.colorscheme 'dracula' diff --git a/dracula-soft.yml b/dracula-soft.yml index 7ddabf4..7a4e2d6 100644 --- a/dracula-soft.yml +++ b/dracula-soft.yml @@ -121,8 +121,8 @@ palette: purple: "#bf9eee" red: "#ee6666" yellow: "#e7ee98" - diag_info: "#8be9fd" - diag_hint: "#8be9fd" + diag_info: "#adf6f6" + diag_hint: "#adf6f6" diag_ok: "#62e884" diag_warning: "#ffb86c" diag_error: "#ee6666" @@ -144,6 +144,7 @@ palette: shade_hint: "#394552" shade_other: "#3F3B52" shade_ok: "#314742" + inlay_hint: "#689494" highlights: editor: - name: ColorColumn @@ -651,6 +652,14 @@ highlights: sp: diag_ok underline: true gui: underline + - name: LspReferenceText + link: Visual + - name: LspReferenceRead + link: Visual + - name: LspReferenceWrite + link: Visual + - name: LspInlayHint + fg: inlay_hint - nvim-navic: - name: NavicText fg: base0 @@ -1037,3 +1046,79 @@ highlights: fg: diag_ok - name: NoiceLspProgressTitle link: Title + - hop.nvim: + - name: HopNextKey + fg: red + - name: HopNextKey1 + fg: cyan + - name: HopUnmatched + fg: base01 + - mini.statusline: + - name: MiniStatuslineModeNormal + fg: base03 + bg: purple + - name: MiniStatuslineModeInsert + fg: base03 + bg: green + - name: MiniStatuslineModeVisual + fg: yellow + bg: base03 + - name: MiniStatuslineModeReplace + fg: red + bg: base03 + - name: MiniStatuslineModeCommand + fg: orange + bg: base03 + - name: MinistatusLineFileName + fg: base0 + bg: base04 + - name: MiniStatuslineDevinfo + fg: base0 + bg: base02 + - name: MiniStatuslineFileinfo + fg: base0 + bg: base02 + - name: MiniStatuslineInactive + fg: base01 + bg: base03 + - mini.tabline: + - name: MiniTablineCurrent + fg: base0 + bg: base03 + - name: MiniTablineVisible + fg: base0 + bg: base03 + - name: MiniTablineHidden + fg: base01 + bg: base03 + - name: MiniTablineModifiedCurrent + link: MiniTabLineCurrent + - name: MiniTablineModifiedVisible + link: MiniTablineVisible + - name: MiniTablineModifiedHidden + link: MiniTablineHidden + - name: MiniTablineFill + fg: base0 + bg: base04 + - name: MiniTablineTabpagesection + fg: base0 + bg: base04 + - mini.starter: + - name: MiniStarterCurrent + link: CursorLine + - name: MiniStarterHeader + fg: red + - name: MiniStarterFooter + fg: base01 + - name: MiniStarterItem + fg: base0 + - name: MiniStarterItemBullet + fg: pink + - name: MiniStarterItemPrefix + fg: pink + - name: MiniStarterSection + link: Title + - name: MiniStarterQuery + fg: pink + bold: true + gui: bold diff --git a/dracula.yml b/dracula.yml index 6ccdb5b..ee0c798 100644 --- a/dracula.yml +++ b/dracula.yml @@ -143,6 +143,7 @@ palette: shade_info: "#374754" shade_hint: "#374754" shade_ok: "#2E4940" + inlay_hint: "#538c98" highlights: editor: - name: ColorColumn @@ -650,6 +651,14 @@ highlights: sp: diag_ok underline: true gui: underline + - name: LspReferenceText + link: Visual + - name: LspReferenceRead + link: Visual + - name: LspReferenceWrite + link: Visual + - name: LspInlayHint + fg: inlay_hint - nvim-navic: - name: NavicText fg: base0 @@ -1036,3 +1045,79 @@ highlights: fg: diag_ok - name: NoiceLspProgressTitle link: Title + - hop.nvim: + - name: HopNextKey + fg: red + - name: HopNextKey1 + fg: cyan + - name: HopUnmatched + fg: base01 + - mini.statusline: + - name: MiniStatuslineModeNormal + fg: base03 + bg: purple + - name: MiniStatuslineModeInsert + fg: base03 + bg: green + - name: MiniStatuslineModeVisual + fg: yellow + bg: base03 + - name: MiniStatuslineModeReplace + fg: red + bg: base03 + - name: MiniStatuslineModeCommand + fg: orange + bg: base03 + - name: MinistatusLineFileName + fg: base0 + bg: base04 + - name: MiniStatuslineDevinfo + fg: base0 + bg: base02 + - name: MiniStatuslineFileinfo + fg: base0 + bg: base02 + - name: MiniStatuslineInactive + fg: base01 + bg: base03 + - mini.tabline: + - name: MiniTablineCurrent + fg: base0 + bg: base03 + - name: MiniTablineVisible + fg: base0 + bg: base03 + - name: MiniTablineHidden + fg: base01 + bg: base03 + - name: MiniTablineModifiedCurrent + link: MiniTabLineCurrent + - name: MiniTablineModifiedVisible + link: MiniTablineVisible + - name: MiniTablineModifiedHidden + link: MiniTablineHidden + - name: MiniTablineFill + fg: base0 + bg: base04 + - name: MiniTablineTabpagesection + fg: base0 + bg: base04 + - mini.starter: + - name: MiniStarterCurrent + link: CursorLine + - name: MiniStarterHeader + fg: red + - name: MiniStarterFooter + fg: base01 + - name: MiniStarterItem + fg: base0 + - name: MiniStarterItemBullet + fg: pink + - name: MiniStarterItemPrefix + fg: pink + - name: MiniStarterSection + link: Title + - name: MiniStarterQuery + fg: pink + bold: true + gui: bold diff --git a/lua/dracula/config.lua b/lua/dracula/config.lua index 120cf16..1506185 100644 --- a/lua/dracula/config.lua +++ b/lua/dracula/config.lua @@ -23,5 +23,9 @@ return { ['lazy.nvim'] = true, ['telescope.nvim'] = true, ['noice.nvim'] = true, + ['hop.nvim'] = true, + ['mini.statusline'] = true, + ['mini.tabline'] = true, + ['mini.starter'] = true, }, } diff --git a/lua/dracula/highlights/init.lua b/lua/dracula/highlights/init.lua index e616f10..53a5422 100644 --- a/lua/dracula/highlights/init.lua +++ b/lua/dracula/highlights/init.lua @@ -118,6 +118,10 @@ ---@field DiagnosticUnderlineInfo? table ---@field DiagnosticUnderlineHint? table ---@field DiagnosticUnderlineOk? table +---@field LspReferenceText? table +---@field LspReferenceRead? table +---@field LspReferenceWrite? table +---@field LspInlayHint? table ---@field NavicText? table ---@field NavicSeparator? table ---@field NavicIconsMethod? table @@ -282,6 +286,34 @@ ---@field NoiceLspProgressSpinner? table ---@field NoiceLspProgressClient? table ---@field NoiceLspProgressTitle? table +---@field HopNextKey? table +---@field HopNextKey1? table +---@field HopUnmatched? table +---@field MiniStatuslineModeNormal? table +---@field MiniStatuslineModeInsert? table +---@field MiniStatuslineModeVisual? table +---@field MiniStatuslineModeReplace? table +---@field MiniStatuslineModeCommand? table +---@field MinistatusLineFileName? table +---@field MiniStatuslineDevinfo? table +---@field MiniStatuslineFileinfo? table +---@field MiniStatuslineInactive? table +---@field MiniTablineCurrent? table +---@field MiniTablineVisible? table +---@field MiniTablineHidden? table +---@field MiniTablineModifiedCurrent? table +---@field MiniTablineModifiedVisible? table +---@field MiniTablineModifiedHidden? table +---@field MiniTablineFill? table +---@field MiniTablineTabpagesection? table +---@field MiniStarterCurrent? table +---@field MiniStarterHeader? table +---@field MiniStarterFooter? table +---@field MiniStarterItem? table +---@field MiniStarterItemBullet? table +---@field MiniStarterItemPrefix? table +---@field MiniStarterSection? table +---@field MiniStarterQuery? table local M = {} @@ -537,6 +569,10 @@ M.set_highlight = function(colors, config) nvim_set_hl('DiagnosticUnderlineInfo', { fg = colors.diag_info, underline = true }) nvim_set_hl('DiagnosticUnderlineHint', { fg = colors.diag_hint, underline = true }) nvim_set_hl('DiagnosticUnderlineOk', { fg = colors.diag_ok, underline = true }) + nvim_set_hl('LspReferenceText', { link = 'Visual' }) + nvim_set_hl('LspReferenceRead', { link = 'Visual' }) + nvim_set_hl('LspReferenceWrite', { link = 'Visual' }) + nvim_set_hl('LspInlayHint', { fg = colors.inlay_hint }) end if config.plugins['nvim-navic'] then @@ -744,6 +780,46 @@ M.set_highlight = function(colors, config) nvim_set_hl('NoiceLspProgressClient', { fg = colors.diag_ok }) nvim_set_hl('NoiceLspProgressTitle', { link = 'Title' }) end + + if config.plugins['hop.nvim'] then + nvim_set_hl('HopNextKey', { fg = colors.red }) + nvim_set_hl('HopNextKey1', { fg = colors.cyan }) + nvim_set_hl('HopUnmatched', { fg = colors.base01 }) + end + + if config.plugins['mini.statusline'] then + nvim_set_hl('MiniStatuslineModeNormal', { fg = colors.base03, bg = colors.purple }) + nvim_set_hl('MiniStatuslineModeInsert', { fg = colors.base03, bg = colors.green }) + nvim_set_hl('MiniStatuslineModeVisual', { fg = colors.yellow, bg = colors.base03 }) + nvim_set_hl('MiniStatuslineModeReplace', { fg = colors.red, bg = colors.base03 }) + nvim_set_hl('MiniStatuslineModeCommand', { fg = colors.orange, bg = colors.base03 }) + nvim_set_hl('MinistatusLineFileName', { fg = colors.base0, bg = colors.base04 }) + nvim_set_hl('MiniStatuslineDevinfo', { fg = colors.base0, bg = colors.base02 }) + nvim_set_hl('MiniStatuslineFileinfo', { fg = colors.base0, bg = colors.base02 }) + nvim_set_hl('MiniStatuslineInactive', { fg = colors.base01, bg = colors.base03 }) + end + + if config.plugins['mini.tabline'] then + nvim_set_hl('MiniTablineCurrent', { fg = colors.base0, bg = colors.base03 }) + nvim_set_hl('MiniTablineVisible', { fg = colors.base0, bg = colors.base03 }) + nvim_set_hl('MiniTablineHidden', { fg = colors.base01, bg = colors.base03 }) + nvim_set_hl('MiniTablineModifiedCurrent', { link = 'MiniTabLineCurrent' }) + nvim_set_hl('MiniTablineModifiedVisible', { link = 'MiniTablineVisible' }) + nvim_set_hl('MiniTablineModifiedHidden', { link = 'MiniTablineHidden' }) + nvim_set_hl('MiniTablineFill', { fg = colors.base0, bg = colors.base04 }) + nvim_set_hl('MiniTablineTabpagesection', { fg = colors.base0, bg = colors.base04 }) + end + + if config.plugins['mini.starter'] then + nvim_set_hl('MiniStarterCurrent', { link = 'CursorLine' }) + nvim_set_hl('MiniStarterHeader', { fg = colors.red }) + nvim_set_hl('MiniStarterFooter', { fg = colors.base01 }) + nvim_set_hl('MiniStarterItem', { fg = colors.base0 }) + nvim_set_hl('MiniStarterItemBullet', { fg = colors.pink }) + nvim_set_hl('MiniStarterItemPrefix', { fg = colors.pink }) + nvim_set_hl('MiniStarterSection', { link = 'Title' }) + nvim_set_hl('MiniStarterQuery', { fg = colors.pink, bold = true }) + end if config.on_highlight then local color = require 'dracula.color' local highlights = config.on_highlight(colors, color) diff --git a/lua/dracula/palette/init.lua b/lua/dracula/palette/init.lua index 81e8e52..45f4709 100644 --- a/lua/dracula/palette/init.lua +++ b/lua/dracula/palette/init.lua @@ -14,6 +14,7 @@ ---@field git_modified? string ---@field git_removed? string ---@field green? string +---@field inlay_hint? string ---@field orange? string ---@field pink? string ---@field purple? string @@ -49,6 +50,7 @@ return { git_modified = '#FFB86C', git_removed = '#FF5555', green = '#50FA7A', + inlay_hint = '#538C98', orange = '#FFB86C', pink = '#FF79C6', purple = '#BD93F9',