iofq/nvim.nix
1
0
Fork 0
mirror of https://github.com/iofq/nvim.nix.git synced 2026-01-23 08:55:16 -06:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

snacks rice + new colorscheme

Browse source
This commit is contained in:
iofq 2025-07-06 21:11:29 -05:00
parent 66d50e274e
commit d998429cb8
No known key found for this signature in database
GPG key ID: ECF3B2DA38BF7183
15 changed files with 1068 additions and 427 deletions
Download patch file Download diff file Expand all files Collapse all files

30
nix/mkNeovim.nix
View file

@ -35,8 +35,7 @@ with lib;
viAlias ? appName == "nvim", # Add a "vi" binary to the build output as an alias? viAlias ? appName == "nvim", # Add a "vi" binary to the build output as an alias?
vimAlias ? appName == "nvim", # Add a "vim" binary to the build output as an alias? vimAlias ? appName == "nvim", # Add a "vim" binary to the build output as an alias?
wrapRc ? true, wrapRc ? true,
}: }: let
let
# This is the structure of a plugin definition. # This is the structure of a plugin definition.
# Each plugin in the `plugins` argument list can also be defined as this attrset # Each plugin in the `plugins` argument list can also be defined as this attrset
defaultPlugin = { defaultPlugin = {
@ -52,7 +51,14 @@ let
externalPackages = extraPackages ++ (optionals withSqlite [pkgs.sqlite]); externalPackages = extraPackages ++ (optionals withSqlite [pkgs.sqlite]);
# Map all plugins to an attrset { plugin = <plugin>; config = <config>; optional = <tf>; ... } # Map all plugins to an attrset { plugin = <plugin>; config = <config>; optional = <tf>; ... }
normalizedPlugins = map (x: defaultPlugin // (if x ? plugin then x else { plugin = x; })) plugins; normalizedPlugins = map (x:
defaultPlugin
// (
if x ? plugin
then x
else {plugin = x;}
))
plugins;
# This nixpkgs util function creates an attrset # This nixpkgs util function creates an attrset
# that pkgs.wrapNeovimUnstable uses to configure the Neovim build. # that pkgs.wrapNeovimUnstable uses to configure the Neovim build.
@ -74,16 +80,13 @@ let
# This uses the ignoreConfigRegexes list to filter # This uses the ignoreConfigRegexes list to filter
# the nvim directory # the nvim directory
nvimRtpSrc = nvimRtpSrc = let
let
src = ../nvim; src = ../nvim;
in in
lib.cleanSourceWith { lib.cleanSourceWith {
inherit src; inherit src;
name = "nvim-rtp-src"; name = "nvim-rtp-src";
filter = filter = path: tyoe: let
path: tyoe:
let
srcPrefix = toString src + "/"; srcPrefix = toString src + "/";
relPath = lib.removePrefix srcPrefix (toString path); relPath = lib.removePrefix srcPrefix (toString path);
in in
@ -100,15 +103,11 @@ let
src = nvimRtpSrc; src = nvimRtpSrc;
buildPhase = '' buildPhase = ''
mkdir -p $out/lua mkdir -p $out/
mkdir -p $out/ftplugin
''; '';
installPhase = '' installPhase = ''
cp -r lua $out/ cp -r . $out/
rm -r lua
cp -r ftplugin $out/
rm -r ftplugin
''; '';
}; };
@ -119,8 +118,9 @@ let
'' ''
LAZY_OPTS = { LAZY_OPTS = {
performance = { performance = {
reset_packpath = true, reset_packpath = false,
rtp = { rtp = {
reset = false,
disabled_plugins = { disabled_plugins = {
"netrwPlugin", "netrwPlugin",
"tutor", "tutor",

18
nix/neovim-overlay.nix
View file

@ -1,10 +1,13 @@
# This overlay, when applied to nixpkgs, adds the final neovim derivation to nixpkgs. # This overlay, when applied to nixpkgs, adds the final neovim derivation to nixpkgs.
{inputs}: final: prev: { inputs }:
with final.pkgs.lib; let final: prev:
with final.pkgs.lib;
let
pkgs = final; pkgs = final;
pkgs-wrapNeovim = prev; pkgs-wrapNeovim = prev;
mkNvimPlugin = src: pname: mkNvimPlugin =
src: pname:
pkgs.vimUtils.buildVimPlugin { pkgs.vimUtils.buildVimPlugin {
inherit pname src; inherit pname src;
version = src.lastModifiedDate; version = src.lastModifiedDate;
@ -20,11 +23,11 @@ with final.pkgs.lib; let
friendly-snippets friendly-snippets
lazy-nvim lazy-nvim
mini-nvim mini-nvim
nightfox-nvim
nvim-lint nvim-lint
nvim-lspconfig nvim-lspconfig
nvim-treesitter-context nvim-treesitter-context
nvim-treesitter-textobjects nvim-treesitter-textobjects
nvim-treesitter-textsubjects
nvim-treesitter.withAllGrammars nvim-treesitter.withAllGrammars
quicker-nvim quicker-nvim
refactoring-nvim refactoring-nvim
@ -35,6 +38,7 @@ with final.pkgs.lib; let
basePackages = with pkgs; [ basePackages = with pkgs; [
ripgrep ripgrep
fd
]; ];
# Extra packages that should be included on nixos but don't need to be bundled # Extra packages that should be included on nixos but don't need to be bundled
extraPackages = with pkgs; [ extraPackages = with pkgs; [
@ -54,14 +58,14 @@ with final.pkgs.lib; let
#other #other
jujutsu jujutsu
fd
]; ];
in { in
{
nvim-pkg = mkNeovim { nvim-pkg = mkNeovim {
plugins = all-plugins; plugins = all-plugins;
appName = "nvim"; appName = "nvim";
extraPackages = basePackages ++ extraPackages; extraPackages = basePackages ++ extraPackages;
withNodeJs = true; withNodeJs = false;
}; };
nvim-min-pkg = mkNeovim { nvim-min-pkg = mkNeovim {

704
nvim/colors/iofq.lua Normal file
View file

@ -0,0 +1,704 @@
-- Made with 'mini.colors' module of https://github.com/echasnovski/mini.nvim
if vim.g.colors_name ~= nil then
vim.cmd('highlight clear')
end
vim.g.colors_name = 'iofq'
-- Highlight groups
local hi = vim.api.nvim_set_hl
hi(0, '@attribute', { link = 'Constant' })
hi(0, '@character.special', { link = 'SpecialChar' })
hi(0, '@comment.error', { bg = '#e85c51', fg = '#152528' })
hi(0, '@comment.note', { bg = '#5a93aa', fg = '#152528' })
hi(0, '@comment.todo', { bg = '#7aa4a1', fg = '#152528' })
hi(0, '@comment.warning', { bg = '#fda47f', fg = '#152528' })
hi(0, '@conditional', { link = 'Conditional' })
hi(0, '@constant.builtin', { fg = '#ff9664' })
hi(0, '@constant.macro', { link = 'Macro' })
hi(0, '@constructor', { fg = '#a1cdd8' })
hi(0, '@constructor.lua', { fg = '#cbd9d8' })
hi(0, '@diff.delta', { link = 'diffChanged' })
hi(0, '@diff.minus', { link = 'diffRemoved' })
hi(0, '@diff.plus', { link = 'diffAdded' })
hi(0, '@exception', { link = 'Exception' })
hi(0, '@field', { fg = '#5a93aa' })
hi(0, '@field.rust', { fg = '#cbd9d8' })
hi(0, '@float', { link = 'Float' })
hi(0, '@function.builtin', { fg = '#e85c51' })
hi(0, '@function.macro', { fg = '#e85c51' })
hi(0, '@include', { link = 'Include' })
hi(0, '@keyword.conditional', { link = 'Conditional' })
hi(0, '@keyword.conditional.ternary', { link = 'Conditional' })
hi(0, '@keyword.exception', { link = 'Exception' })
hi(0, '@keyword.function', { fg = '#ad5c7c' })
hi(0, '@keyword.import', { link = 'Include' })
hi(0, '@keyword.operator', { fg = '#cbd9d8' })
hi(0, '@keyword.repeat', { link = 'Repeat' })
hi(0, '@keyword.return', { fg = '#e85c51' })
hi(0, '@keyword.storage', { link = 'StorageClass' })
hi(0, '@label.json', { fg = '#73a3b7' })
hi(0, '@lsp.type.boolean', { link = '@boolean' })
hi(0, '@lsp.type.builtinType', { link = '@type.builtin' })
hi(0, '@lsp.type.comment', { link = '@comment' })
hi(0, '@lsp.type.enum', { link = '@type' })
hi(0, '@lsp.type.enumMember', { link = '@constant' })
hi(0, '@lsp.type.escapeSequence', { link = '@string.escape' })
hi(0, '@lsp.type.formatSpecifier', { link = '@punctuation.special' })
hi(0, '@lsp.type.interface', { fg = '#eb746b' })
hi(0, '@lsp.type.keyword', { link = '@keyword' })
hi(0, '@lsp.type.namespace', { link = '@module' })
hi(0, '@lsp.type.number', { link = '@number' })
hi(0, '@lsp.type.operator', { link = '@operator' })
hi(0, '@lsp.type.parameter', { link = '@parameter' })
hi(0, '@lsp.type.property', { link = '@property' })
hi(0, '@lsp.type.selfKeyword', { link = '@variable.builtin' })
hi(0, '@lsp.type.typeAlias', { link = '@type.definition' })
hi(0, '@lsp.type.unresolvedReference', { link = '@error' })
hi(0, '@lsp.type.variable', {})
hi(0, '@lsp.typemod.class.defaultLibrary', { link = '@type.builtin' })
hi(0, '@lsp.typemod.enum.defaultLibrary', { link = '@type.builtin' })
hi(0, '@lsp.typemod.enumMember.defaultLibrary', { link = '@constant.builtin' })
hi(0, '@lsp.typemod.function.defaultLibrary', { link = '@function.builtin' })
hi(0, '@lsp.typemod.keyword.async', { link = '@keyword.coroutine' })
hi(0, '@lsp.typemod.macro.defaultLibrary', { link = '@function.builtin' })
hi(0, '@lsp.typemod.method.defaultLibrary', { link = '@function.builtin' })
hi(0, '@lsp.typemod.operator.injected', { link = '@operator' })
hi(0, '@lsp.typemod.string.injected', { link = '@string' })
hi(0, '@lsp.typemod.type.defaultLibrary', { link = '@type.builtin' })
hi(0, '@lsp.typemod.variable.defaultLibrary', { link = '@variable.builtin' })
hi(0, '@lsp.typemod.variable.injected', { link = '@variable' })
hi(0, '@markup', { fg = '#e6eaea' })
hi(0, '@markup.heading', { link = 'Title' })
hi(0, '@markup.heading.1.delimiter.vimdoc', { nocombine = true, sp = '#e6eaea', underdouble = true })
hi(0, '@markup.heading.2.delimiter.vimdoc', { nocombine = true, sp = '#e6eaea', underline = true })
hi(0, '@markup.italic', { link = 'Italic' })
hi(0, '@markup.link', { bold = true, fg = '#ad5c7c' })
hi(0, '@markup.link.label', { link = 'Special' })
hi(0, '@markup.link.url', { fg = '#ff9664', italic = true, underline = true })
hi(0, '@markup.list', { fg = '#afd4de' })
hi(0, '@markup.list.checked', { fg = '#7aa4a1' })
hi(0, '@markup.list.unchecked', { fg = '#fda47f' })
hi(0, '@markup.math', { fg = '#73a3b7' })
hi(0, '@markup.quote', { fg = '#cbd9d8' })
hi(0, '@markup.raw', { fg = '#a1cdd8', italic = true })
hi(0, '@markup.raw.block', { fg = '#cb7985' })
hi(0, '@markup.strikethrough', { fg = '#e6eaea', strikethrough = true })
hi(0, '@markup.strong', { bold = true, fg = '#c54e45' })
hi(0, '@markup.underline', { link = 'Underline' })
hi(0, '@module', { fg = '#afd4de' })
hi(0, '@namespace', { fg = '#afd4de' })
hi(0, '@number.float', { link = 'Float' })
hi(0, '@parameter', { fg = '#afd4de' })
hi(0, '@property', { fg = '#5a93aa' })
hi(0, '@punctuation.bracket', { fg = '#cbd9d8' })
hi(0, '@punctuation.delimiter', { fg = '#cbd9d8' })
hi(0, '@punctuation.special', { fg = '#afd4de' })
hi(0, '@repeat', { link = 'Repeat' })
hi(0, '@storageclass', { link = 'StorageClass' })
hi(0, '@string.escape', { bold = true, fg = '#fdb292' })
hi(0, '@string.regex', { fg = '#fdb292' })
hi(0, '@string.regexp', { fg = '#fdb292' })
hi(0, '@string.special', { link = 'Special' })
hi(0, '@string.special.url', { fg = '#ff9664', italic = true, underline = true })
hi(0, '@tag', { fg = '#ad5c7c' })
hi(0, '@tag.attribute', { fg = '#73a3b7', italic = true })
hi(0, '@tag.delimiter', { fg = '#afd4de' })
hi(0, '@text', { fg = '#e6eaea' })
hi(0, '@text.danger', { bg = '#e85c51', fg = '#152528' })
hi(0, '@text.diff.add', { link = 'diffAdded' })
hi(0, '@text.diff.delete', { link = 'diffRemoved' })
hi(0, '@text.emphasis', { link = 'Italic' })
hi(0, '@text.literal', { fg = '#a1cdd8', italic = true })
hi(0, '@text.math', { fg = '#73a3b7' })
hi(0, '@text.note', { bg = '#5a93aa', fg = '#152528' })
hi(0, '@text.reference', { bold = true, fg = '#ad5c7c' })
hi(0, '@text.strike', { fg = '#e6eaea', strikethrough = true })
hi(0, '@text.strong', { bold = true, fg = '#c54e45' })
hi(0, '@text.title', { link = 'Title' })
hi(0, '@text.todo', { bg = '#7aa4a1', fg = '#152528' })
hi(0, '@text.todo.checked', { fg = '#7aa4a1' })
hi(0, '@text.todo.unchecked', { fg = '#fda47f' })
hi(0, '@text.underline', { link = 'Underline' })
hi(0, '@text.warning', { bg = '#fda47f', fg = '#152528' })
hi(0, '@type.builtin', { fg = '#afd4de' })
hi(0, '@variable', { fg = '#ebebeb' })
hi(0, '@variable.builtin', { fg = '#e85c51' })
hi(0, '@variable.member', { fg = '#5a93aa' })
hi(0, '@variable.parameter', { fg = '#afd4de' })
hi(0, 'AerialGuide', { fg = '#2d4f56' })
hi(0, 'AerialLine', { link = 'Search' })
hi(0, 'AlphaButtons', { fg = '#a1cdd8' })
hi(0, 'AlphaFooter', { fg = '#5a93aa' })
hi(0, 'AlphaHeader', { fg = '#73a3b7' })
hi(0, 'AlphaHeaderLabel', { fg = '#ff8349' })
hi(0, 'AlphaShortcut', { fg = '#ff8349' })
hi(0, 'BlinkCmpCursorLineDocumentationHack', { bg = '#254147' })
hi(0, 'BlinkCmpCursorLineMenuHack', { bg = '#425e5e' })
hi(0, 'BlinkCmpDoc', { bg = '#0f1c1e', fg = '#e6eaea' })
hi(0, 'BlinkCmpDocBorder', { bg = '#0f1c1e', fg = '#293e40' })
hi(0, 'BlinkCmpGhostText', { link = 'String' })
hi(0, 'BlinkCmpKindClass', { link = 'Type' })
hi(0, 'BlinkCmpKindConstant', { link = '@constant' })
hi(0, 'BlinkCmpKindConstructor', { link = 'Function' })
hi(0, 'BlinkCmpKindDefault', { fg = '#cbd9d8' })
hi(0, 'BlinkCmpKindEnum', { link = 'Constant' })
hi(0, 'BlinkCmpKindEnumMember', { link = '@field' })
hi(0, 'BlinkCmpKindEvent', { link = 'Constant' })
hi(0, 'BlinkCmpKindField', { link = '@field' })
hi(0, 'BlinkCmpKindFunction', { link = 'Function' })
hi(0, 'BlinkCmpKindInterface', { link = 'Constant' })
hi(0, 'BlinkCmpKindKeyword', { link = 'Identifier' })
hi(0, 'BlinkCmpKindMethod', { link = 'Function' })
hi(0, 'BlinkCmpKindModule', { link = '@namespace' })
hi(0, 'BlinkCmpKindOperator', { link = 'Operator' })
hi(0, 'BlinkCmpKindProperty', { link = '@property' })
hi(0, 'BlinkCmpKindReference', { link = 'Keyword' })
hi(0, 'BlinkCmpKindSnippet', { fg = '#cbd9d8' })
hi(0, 'BlinkCmpKindStruct', { link = 'Type' })
hi(0, 'BlinkCmpKindTypeParameter', { link = '@field' })
hi(0, 'BlinkCmpKindUnit', { link = 'Constant' })
hi(0, 'BlinkCmpKindValue', { link = 'Keyword' })
hi(0, 'BlinkCmpKindVariable', { link = '@variable' })
hi(0, 'BlinkCmpLabel', { fg = '#e6eaea' })
hi(0, 'BlinkCmpLabelDeprecated', { fg = '#587b7b', strikethrough = true })
hi(0, 'BlinkCmpLabelDetail', { link = 'Comment' })
hi(0, 'BlinkCmpLabelMatch', { fg = '#73a3b7' })
hi(0, 'Bold', { bold = true })
hi(0, 'Boolean', { link = 'Number' })
hi(0, 'BufferCurrent', { bg = '#587b7b', fg = '#e6eaea' })
hi(0, 'BufferCurrentIndex', { bg = '#587b7b', fg = '#5a93aa' })
hi(0, 'BufferCurrentMod', { bg = '#587b7b', fg = '#fda47f' })
hi(0, 'BufferCurrentSign', { bg = '#587b7b', fg = '#5a93aa' })
hi(0, 'BufferCurrentTarget', { bg = '#587b7b', fg = '#e85c51' })
hi(0, 'BufferInactive', { bg = '#0f1c1e', fg = '#6d7f8b' })
hi(0, 'BufferInactiveIndex', { bg = '#0f1c1e', fg = '#6d7f8b' })
hi(0, 'BufferInactiveMod', { bg = '#0f1c1e', fg = '#383835' })
hi(0, 'BufferInactiveSign', { bg = '#0f1c1e', fg = '#254147' })
hi(0, 'BufferInactiveTarget', { bg = '#0f1c1e', fg = '#e85c51' })
hi(0, 'BufferTabpage', { bg = '#0f1c1e', fg = '#254147' })
hi(0, 'BufferTabpages', { bg = '#0f1c1e' })
hi(0, 'BufferVisible', { bg = '#0f1c1e', fg = '#e6eaea' })
hi(0, 'BufferVisibleIndex', { bg = '#0f1c1e', fg = '#5a93aa' })
hi(0, 'BufferVisibleMod', { bg = '#0f1c1e', fg = '#fda47f' })
hi(0, 'BufferVisibleSign', { bg = '#0f1c1e', fg = '#5a93aa' })
hi(0, 'BufferVisibleTarget', { bg = '#0f1c1e', fg = '#e85c51' })
hi(0, 'Character', { link = 'String' })
hi(0, 'CmpDocumentation', { bg = '#0f1c1e', fg = '#e6eaea' })
hi(0, 'CmpDocumentationBorder', { bg = '#0f1c1e', fg = '#293e40' })
hi(0, 'CmpItemAbbr', { fg = '#e6eaea' })
hi(0, 'CmpItemAbbrDeprecated', { fg = '#587b7b', strikethrough = true })
hi(0, 'CmpItemAbbrMatch', { fg = '#73a3b7' })
hi(0, 'CmpItemAbbrMatchFuzzy', { fg = '#73a3b7' })
hi(0, 'CmpItemKindClass', { link = 'Type' })
hi(0, 'CmpItemKindConstant', { link = '@constant' })
hi(0, 'CmpItemKindConstructor', { link = 'Function' })
hi(0, 'CmpItemKindDefault', { fg = '#cbd9d8' })
hi(0, 'CmpItemKindEnum', { link = 'Constant' })
hi(0, 'CmpItemKindEnumMember', { link = '@field' })
hi(0, 'CmpItemKindEvent', { link = 'Constant' })
hi(0, 'CmpItemKindField', { link = '@field' })
hi(0, 'CmpItemKindFunction', { link = 'Function' })
hi(0, 'CmpItemKindInterface', { link = 'Constant' })
hi(0, 'CmpItemKindKeyword', { link = 'Identifier' })
hi(0, 'CmpItemKindMethod', { link = 'Function' })
hi(0, 'CmpItemKindModule', { link = '@namespace' })
hi(0, 'CmpItemKindOperator', { link = 'Operator' })
hi(0, 'CmpItemKindProperty', { link = '@property' })
hi(0, 'CmpItemKindReference', { link = 'Keyword' })
hi(0, 'CmpItemKindSnippet', { fg = '#cbd9d8' })
hi(0, 'CmpItemKindStruct', { link = 'Type' })
hi(0, 'CmpItemKindTypeParameter', { link = '@field' })
hi(0, 'CmpItemKindUnit', { link = 'Constant' })
hi(0, 'CmpItemKindValue', { link = 'Keyword' })
hi(0, 'CmpItemKindVariable', { link = '@variable' })
hi(0, 'CmpItemMenu', { link = 'Comment' })
hi(0, 'CocInlayHint', { bg = '#1d3337', fg = '#6d7f8b' })
hi(0, 'ColorColumn', { bg = '#1d3337' })
hi(0, 'Comment', { fg = '#6d7f8b' })
hi(0, 'Conceal', { fg = '#2d4f56' })
hi(0, 'Conditional', { fg = '#b97490' })
hi(0, 'Constant', { fg = '#ff9664' })
hi(0, 'CurSearch', { link = 'IncSearch' })
hi(0, 'Cursor', { bg = '#e6eaea', fg = '#152528' })
hi(0, 'CursorColumn', { link = 'CursorLine' })
hi(0, 'CursorLine', { bg = '#254147' })
hi(0, 'CursorLineNr', { bold = true, fg = '#fda47f' })
hi(0, 'DapUIBreakpointsCurrentLine', { bold = true, fg = '#7aa4a1' })
hi(0, 'DapUIBreakpointsDisabledLine', { fg = '#6d7f8b' })
hi(0, 'DapUIBreakpointsInfo', { fg = '#5a93aa' })
hi(0, 'DapUIBreakpointsLine', { link = 'DapUILineNumber' })
hi(0, 'DapUIBreakpointsPath', { fg = '#afd4de' })
hi(0, 'DapUIDecoration', { fg = '#587b7b' })
hi(0, 'DapUIFloatBorder', { link = 'FloatBorder' })
hi(0, 'DapUIFrameName', { link = 'Normal' })
hi(0, 'DapUILineNumber', { link = 'Number' })
hi(0, 'DapUIModifiedValue', { bold = true, fg = '#ebebeb' })
hi(0, 'DapUIScope', { fg = '#afd4de' })
hi(0, 'DapUISource', { link = 'Keyword' })
hi(0, 'DapUIStoppedThread', { fg = '#afd4de' })
hi(0, 'DapUIThread', { link = 'String' })
hi(0, 'DapUIType', { link = 'Type' })
hi(0, 'DapUIValue', { fg = '#ebebeb' })
hi(0, 'DapUIVariable', { fg = '#ebebeb' })
hi(0, 'DapUIWatchesEmpty', { fg = '#e85c51' })
hi(0, 'DapUIWatchesError', { fg = '#e85c51' })
hi(0, 'DapUIWatchesValue', { fg = '#fda47f' })
hi(0, 'DashboardCenter', { link = 'String' })
hi(0, 'DashboardFooter', { fg = '#ff9664', italic = true })
hi(0, 'DashboardHeader', { link = 'Title' })
hi(0, 'DashboardShortCut', { link = 'Identifier' })
hi(0, 'Delimiter', { link = 'Special' })
hi(0, 'DiagnosticError', { fg = '#e85c51' })
hi(0, 'DiagnosticHint', { fg = '#7aa4a1' })
hi(0, 'DiagnosticInfo', { fg = '#5a93aa' })
hi(0, 'DiagnosticOk', { fg = '#7aa4a1' })
hi(0, 'DiagnosticUnderlineError', { sp = '#e85c51', undercurl = true })
hi(0, 'DiagnosticUnderlineHint', { sp = '#7aa4a1', undercurl = true })
hi(0, 'DiagnosticUnderlineInfo', { sp = '#5a93aa', undercurl = true })
hi(0, 'DiagnosticUnderlineOk', { sp = '#7aa4a1', undercurl = true })
hi(0, 'DiagnosticUnderlineWarn', { sp = '#fda47f', undercurl = true })
hi(0, 'DiagnosticVirtualTextError', { bg = '#352d2e', fg = '#e85c51' })
hi(0, 'DiagnosticVirtualTextHint', { bg = '#24383a', fg = '#7aa4a1' })
hi(0, 'DiagnosticVirtualTextInfo', { bg = '#1f353c', fg = '#5a93aa' })
hi(0, 'DiagnosticVirtualTextOk', { bg = '#24383a', fg = '#7aa4a1' })
hi(0, 'DiagnosticVirtualTextWarn', { bg = '#383835', fg = '#fda47f' })
hi(0, 'DiagnosticWarn', { fg = '#fda47f' })
hi(0, 'DiffAdd', { bg = '#293e40' })
hi(0, 'DiffChange', { bg = '#31474b' })
hi(0, 'DiffDelete', { bg = '#4a3332' })
hi(0, 'DiffText', { bg = '#466066' })
hi(0, 'DiffviewDiffAddAsDelete', { bg = '#4a3332' })
hi(0, 'DiffviewDim1', { fg = '#6d7f8b' })
hi(0, 'DiffviewFilePanelCounter', { bold = true, fg = '#a1cdd8' })
hi(0, 'DiffviewFilePanelFileName', { fg = '#e6eaea' })
hi(0, 'DiffviewFilePanelTitle', { bold = true, fg = '#b97490' })
hi(0, 'DiffviewPrimary', { fg = '#73a3b7' })
hi(0, 'DiffviewSecondary', { fg = '#7aa4a1' })
hi(0, 'Directory', { fg = '#73a3b7' })
hi(0, 'EndOfBuffer', { fg = '#152528' })
hi(0, 'Error', { fg = '#e85c51' })
hi(0, 'ErrorMsg', { fg = '#e85c51' })
hi(0, 'Exception', { link = 'Keyword' })
hi(0, 'EyelinerDimmed', { fg = '#6d7f8b' })
hi(0, 'EyelinerPrimary', { underline = true })
hi(0, 'EyelinerSecondary', { bold = true, underline = true })
hi(0, 'FernBranchText', { fg = '#5a93aa' })
hi(0, 'FidgetTask', { link = 'LineNr' })
hi(0, 'FidgetTitle', { link = 'Title' })
hi(0, 'FloatBorder', { fg = '#587b7b' })
hi(0, 'FocusedSymbol', { link = 'Search' })
hi(0, 'FoldColumn', { fg = '#587b7b' })
hi(0, 'Folded', { bg = '#1d3337', fg = '#587b7b' })
hi(0, 'Function', { fg = '#73a3b7' })
hi(0, 'GitGutterAdd', { fg = '#7aa4a1' })
hi(0, 'GitGutterChange', { fg = '#fda47f' })
hi(0, 'GitGutterDelete', { fg = '#e85c51' })
hi(0, 'GitSignsAdd', { fg = '#7aa4a1' })
hi(0, 'GitSignsChange', { fg = '#fda47f' })
hi(0, 'GitSignsDelete', { fg = '#e85c51' })
hi(0, 'GlyphPalette0', { fg = '#2f3239' })
hi(0, 'GlyphPalette1', { fg = '#e85c51' })
hi(0, 'GlyphPalette10', { fg = '#8eb2af' })
hi(0, 'GlyphPalette11', { fg = '#fdb292' })
hi(0, 'GlyphPalette12', { fg = '#73a3b7' })
hi(0, 'GlyphPalette13', { fg = '#b97490' })
hi(0, 'GlyphPalette14', { fg = '#afd4de' })
hi(0, 'GlyphPalette15', { fg = '#eeeeee' })
hi(0, 'GlyphPalette2', { fg = '#7aa4a1' })
hi(0, 'GlyphPalette3', { fg = '#fda47f' })
hi(0, 'GlyphPalette4', { fg = '#5a93aa' })
hi(0, 'GlyphPalette5', { fg = '#ad5c7c' })
hi(0, 'GlyphPalette6', { fg = '#a1cdd8' })
hi(0, 'GlyphPalette7', { fg = '#eeeeee' })
hi(0, 'GlyphPalette8', { fg = '#4e5157' })
hi(0, 'GlyphPalette9', { fg = '#eb746b' })
hi(0, 'HopNextKey', { bold = true, fg = '#a1cdd8' })
hi(0, 'HopNextKey1', { bold = true, fg = '#5a93aa' })
hi(0, 'HopNextKey2', { fg = '#4d7d90' })
hi(0, 'HopUnmatched', { fg = '#6d7f8b' })
hi(0, 'Identifier', { fg = '#a1cdd8' })
hi(0, 'IncSearch', { bg = '#7aa4a1', fg = '#152528' })
hi(0, 'IndentBlanklineChar', { fg = '#254147' })
hi(0, 'IndentBlanklineContextChar', { fg = '#ebebeb' })
hi(0, 'IndentBlanklineContextStart', { sp = '#ebebeb', underline = true })
hi(0, 'IndentBlanklineIndent1', { fg = '#cb7985' })
hi(0, 'IndentBlanklineIndent2', { fg = '#5a93aa' })
hi(0, 'IndentBlanklineIndent3', { fg = '#ff8349' })
hi(0, 'IndentBlanklineIndent4', { fg = '#a1cdd8' })
hi(0, 'IndentBlanklineIndent5', { fg = '#e85c51' })
hi(0, 'IndentBlanklineIndent6', { fg = '#fda47f' })
hi(0, 'Italic', { italic = true })
hi(0, 'Keyword', { fg = '#ad5c7c' })
hi(0, 'Label', { link = 'Conditional' })
hi(0, 'LazyButtonActive', { link = 'TabLineSel' })
hi(0, 'LazyDimmed', { link = 'LineNr' })
hi(0, 'LazyProp', { link = 'LineNr' })
hi(0, 'LeapBackdrop', { fg = '#6d7f8b' })
hi(0, 'LeapLabelPrimary', { bg = '#d38d97', fg = '#152528' })
hi(0, 'LeapLabelSecondary', { bg = '#afd4de', fg = '#152528' })
hi(0, 'LeapMatch', { bg = '#d38d97', fg = '#152528' })
hi(0, 'LightspeedGreyWash', { fg = '#6d7f8b' })
hi(0, 'LineNr', { fg = '#587b7b' })
hi(0, 'LspCodeLens', { fg = '#6d7f8b' })
hi(0, 'LspCodeLensSeparator', { fg = '#587b7b' })
hi(0, 'LspFloatWinBorder', { fg = '#587b7b' })
hi(0, 'LspFloatWinNormal', { bg = '#0f1c1e' })
hi(0, 'LspInlayHint', { bg = '#1d3337', fg = '#6d7f8b' })
hi(0, 'LspReferenceRead', { bg = '#293e40' })
hi(0, 'LspReferenceText', { bg = '#293e40' })
hi(0, 'LspReferenceWrite', { bg = '#293e40' })
hi(0, 'LspSagaBorderTitle', { link = 'Title' })
hi(0, 'LspSagaCodeActionBorder', { fg = '#587b7b' })
hi(0, 'LspSagaCodeActionContent', { link = 'String' })
hi(0, 'LspSagaCodeActionTitle', { link = 'Title' })
hi(0, 'LspSagaDefPreviewBorder', { fg = '#587b7b' })
hi(0, 'LspSagaFinderSelection', { fg = '#293e40' })
hi(0, 'LspSagaHoverBorder', { fg = '#587b7b' })
hi(0, 'LspSagaRenameBorder', { fg = '#587b7b' })
hi(0, 'LspSagaSignatureHelpBorder', { fg = '#e85c51' })
hi(0, 'LspSignatureActiveParameter', { fg = '#425e5e' })
hi(0, 'LspTroubleCount', { bg = '#587b7b', fg = '#ad5c7c' })
hi(0, 'LspTroubleNormal', { bg = '#0f1c1e', fg = '#587b7b' })
hi(0, 'LspTroubleText', { fg = '#cbd9d8' })
hi(0, 'MatchParen', { bold = true, fg = '#fda47f' })
hi(0, 'MiniAnimateCursor', { nocombine = true, reverse = true })
hi(0, 'MiniAnimateNormalFloat', { link = 'NormalFloat' })
hi(0, 'MiniClueBorder', { link = 'FloatBorder' })
hi(0, 'MiniClueDescGroup', { link = 'DiagnosticFloatingWarn' })
hi(0, 'MiniClueDescSingle', { link = 'NormalFloat' })
hi(0, 'MiniClueNextKey', { link = 'DiagnosticFloatingHint' })
hi(0, 'MiniClueNextKeyWithPostkeys', { link = 'DiagnosticFloatingError' })
hi(0, 'MiniClueSeparator', { link = 'DiagnosticFloatingInfo' })
hi(0, 'MiniClueTitle', { link = 'FloatTitle' })
hi(0, 'MiniCompletionActiveParameter', { underline = true })
hi(0, 'MiniCursorword', { link = 'LspReferenceText' })
hi(0, 'MiniCursorwordCurrent', { link = 'LspReferenceText' })
hi(0, 'MiniDepsChangeAdded', { link = 'diffAdded' })
hi(0, 'MiniDepsChangeRemoved', { link = 'diffRemoved' })
hi(0, 'MiniDepsHint', { link = 'DiagnosticHint' })
hi(0, 'MiniDepsInfo', { link = 'DiagnosticInfo' })
hi(0, 'MiniDepsMsgBreaking', { link = 'DiagnosticWarn' })
hi(0, 'MiniDepsPlaceholder', { link = 'Comment' })
hi(0, 'MiniDepsTitle', { link = 'Title' })
hi(0, 'MiniDepsTitleError', { bg = '#e85c51', fg = '#0f1c1e' })
hi(0, 'MiniDepsTitleSame', { link = 'DiffText' })
hi(0, 'MiniDepsTitleUpdate', { bg = '#7aa4a1', fg = '#0f1c1e' })
hi(0, 'MiniDiffOverAdd', { link = 'DiffAdd' })
hi(0, 'MiniDiffOverChange', { link = 'DiffText' })
hi(0, 'MiniDiffOverContext', { link = 'DiffChange' })
hi(0, 'MiniDiffOverDelete', { link = 'DiffDelete' })
hi(0, 'MiniDiffSignAdd', { fg = 'green', bold = true })
hi(0, 'MiniDiffSignChange', { fg = 'green', bold = true })
hi(0, 'MiniDiffSignDelete', { fg = 'red', bold = true })
hi(0, 'MiniFilesBorder', { link = 'FloatBorder' })
hi(0, 'MiniFilesBorderModified', { link = 'DiagnosticFloatingWarn' })
hi(0, 'MiniFilesCursorLine', { link = 'CursorLine' })
hi(0, 'MiniFilesDirectory', { link = 'Directory' })
hi(0, 'MiniFilesFile', { fg = '#e6eaea' })
hi(0, 'MiniFilesNormal', { link = 'NormalFloat' })
hi(0, 'MiniFilesTitle', { link = 'FloatTitle' })
hi(0, 'MiniFilesTitleFocused', { bold = true, fg = '#e6eaea' })
hi(0, 'MiniHipatternsFixme', { bg = '#e85c51', bold = true, fg = '#0f1c1e' })
hi(0, 'MiniHipatternsHack', { bg = '#fda47f', bold = true, fg = '#0f1c1e' })
hi(0, 'MiniHipatternsNote', { bg = '#5a93aa', bold = true, fg = '#0f1c1e' })
hi(0, 'MiniHipatternsTodo', { bg = '#7aa4a1', bold = true, fg = '#0f1c1e' })
hi(0, 'MiniIconsAzure', { fg = '#73a3b7' })
hi(0, 'MiniIconsBlue', { fg = '#5a93aa' })
hi(0, 'MiniIconsCyan', { fg = '#a1cdd8' })
hi(0, 'MiniIconsGreen', { fg = '#7aa4a1' })
hi(0, 'MiniIconsGrey', { fg = '#eaeeee' })
hi(0, 'MiniIconsOrange', { fg = '#ff8349' })
hi(0, 'MiniIconsPurple', { fg = '#ad5c7c' })
hi(0, 'MiniIconsRed', { fg = '#e85c51' })
hi(0, 'MiniIconsYellow', { fg = '#fda47f' })
hi(0, 'MiniIndentscopePrefix', { nocombine = true })
hi(0, 'MiniIndentscopeSymbol', { link = 'Delimiter' })
hi(0, 'MiniJump', { bg = '#ad5c7c', fg = '#0f1c1e' })
hi(0, 'MiniJump2dDim', { link = 'Comment' })
hi(0, 'MiniJump2dSpot', { bold = true, fg = '#a1cdd8' })
hi(0, 'MiniJump2dSpotAhead', { bg = '#0f1c1e', fg = '#4d7d90', nocombine = true })
hi(0, 'MiniJump2dSpotUnique', { bold = true, fg = '#fda47f' })
hi(0, 'MiniMapNormal', { link = 'NormalFloat' })
hi(0, 'MiniMapSymbolCount', { link = 'Special' })
hi(0, 'MiniMapSymbolLine', { link = 'Title' })
hi(0, 'MiniMapSymbolView', { link = 'Delimiter' })
hi(0, 'MiniNotifyBorder', { link = 'FloatBorder' })
hi(0, 'MiniNotifyNormal', { link = 'NormalFloat' })
hi(0, 'MiniNotifyTitle', { link = 'FloatTitle' })
hi(0, 'MiniOperatorsExchangeFrom', { link = 'IncSearch' })
hi(0, 'MiniPickBorder', { link = 'FloatBorder' })
hi(0, 'MiniPickBorderBusy', { link = 'DiagnosticFloatingWarn' })
hi(0, 'MiniPickBorderText', { link = 'FloatTitle' })
hi(0, 'MiniPickHeader', { link = 'DiagnosticFloatingHint' })
hi(0, 'MiniPickIconDirectory', { link = 'Directory' })
hi(0, 'MiniPickIconFile', { link = 'MiniPickNormal' })
hi(0, 'MiniPickMatchCurrent', { link = 'CursorLine' })
hi(0, 'MiniPickMatchMarked', { link = 'Visual' })
hi(0, 'MiniPickMatchRanges', { link = 'DiagnosticFloatingHint' })
hi(0, 'MiniPickNormal', { link = 'NormalFloat' })
hi(0, 'MiniPickPreviewLine', { link = 'CursorLine' })
hi(0, 'MiniPickPreviewRegion', { link = 'IncSearch' })
hi(0, 'MiniPickPrompt', { link = 'DiagnosticFloatingInfo' })
hi(0, 'MiniStarterCurrent', { nocombine = true })
hi(0, 'MiniStarterFooter', { fg = '#ff9664', italic = true })
hi(0, 'MiniStarterHeader', { link = 'Title' })
hi(0, 'MiniStarterInactive', { link = 'Comment' })
hi(0, 'MiniStarterItem', { link = 'Normal' })
hi(0, 'MiniStarterItemBullet', { fg = '#587b7b' })
hi(0, 'MiniStarterItemPrefix', { fg = '#cb7985' })
hi(0, 'MiniStarterQuery', { fg = '#7aa4a1' })
hi(0, 'MiniStarterSection', { fg = '#e85c51' })
hi(0, 'MiniStatuslineDevinfo', { bg = '#1d3337', fg = '#cbd9d8' })
hi(0, 'MiniStatuslineFileinfo', { bg = '#1d3337', fg = '#cbd9d8' })
hi(0, 'MiniStatuslineFilename', { link = 'StatusLine' })
hi(0, 'MiniStatuslineInactive', { link = 'StatusLineNC' })
hi(0, 'MiniStatuslineModeCommand', { bg = '#fda47f', bold = true, fg = '#0f1c1e' })
hi(0, 'MiniStatuslineModeInsert', { bg = '#7aa4a1', bold = true, fg = '#0f1c1e' })
hi(0, 'MiniStatuslineModeNormal', { bg = '#a1cdd8', bold = true, fg = '#0f1c1e' })
hi(0, 'MiniStatuslineModeOther', { bg = '#5a93aa', bold = true, fg = '#0f1c1e' })
hi(0, 'MiniStatuslineModeReplace', { bg = '#e85c51', bold = true, fg = '#0f1c1e' })
hi(0, 'MiniStatuslineModeVisual', { bg = '#ad5c7c', bold = true, fg = '#0f1c1e' })
hi(0, 'MiniSurround', { link = 'IncSearch' })
hi(0, 'MiniTablineCurrent', { bg = '#2d4f56', bold = true, fg = '#cbd9d8' })
hi(0, 'MiniTablineFill', { link = 'TabLineFill' })
hi(0, 'MiniTablineHidden', { bg = '#1d3337', fg = '#587b7b' })
hi(0, 'MiniTablineModifiedCurrent', { bg = '#cbd9d8', bold = true, fg = '#2d4f56' })
hi(0, 'MiniTablineModifiedHidden', { bg = '#587b7b', fg = '#1d3337' })
hi(0, 'MiniTablineModifiedVisible', { bg = '#cbd9d8', fg = '#1d3337' })
hi(0, 'MiniTablineTabpagesection', { bg = '#152528', bold = true, fg = '#e6eaea' })
hi(0, 'MiniTablineVisible', { bg = '#1d3337', fg = '#cbd9d8' })
hi(0, 'MiniTestEmphasis', { bold = true })
hi(0, 'MiniTestFail', { bold = true, fg = '#e85c51' })
hi(0, 'MiniTestPass', { bold = true, fg = '#7aa4a1' })
hi(0, 'MiniTrailspace', { bg = '#e85c51' })
hi(0, 'ModeMsg', { bold = true, fg = '#fda47f' })
hi(0, 'ModesCopy', { bg = '#fda47f' })
hi(0, 'ModesDelete', { bg = '#e85c51' })
hi(0, 'ModesInsert', { bg = '#a1cdd8' })
hi(0, 'ModesVisual', { bg = '#ad5c7c' })
hi(0, 'MoreMsg', { bold = true, fg = '#5a93aa' })
hi(0, 'NagicIconsOperator', { link = 'Operator' })
hi(0, 'NavicIconsBoolean', { link = 'Boolean' })
hi(0, 'NavicIconsClass', { link = 'Type' })
hi(0, 'NavicIconsConstant', { link = 'Constant' })
hi(0, 'NavicIconsConstructor', { link = 'Function' })
hi(0, 'NavicIconsEnum', { link = 'Constant' })
hi(0, 'NavicIconsEnumMember', { link = '@field' })
hi(0, 'NavicIconsEvent', { link = 'Constant' })
hi(0, 'NavicIconsField', { link = '@field' })
hi(0, 'NavicIconsFile', { link = 'Directory' })
hi(0, 'NavicIconsFunction', { link = 'Function' })
hi(0, 'NavicIconsInterface', { link = 'Constant' })
hi(0, 'NavicIconsKey', { link = 'Identifier' })
hi(0, 'NavicIconsMethod', { link = 'Function' })
hi(0, 'NavicIconsModule', { link = '@namespace' })
hi(0, 'NavicIconsNamespace', { link = '@namespace' })
hi(0, 'NavicIconsNull', { link = 'Type' })
hi(0, 'NavicIconsNumber', { link = 'Number' })
hi(0, 'NavicIconsObject', { link = '@namespace' })
hi(0, 'NavicIconsPackage', { link = '@namespace' })
hi(0, 'NavicIconsProperty', { link = '@property' })
hi(0, 'NavicIconsString', { link = 'String' })
hi(0, 'NavicIconsStruct', { link = 'Type' })
hi(0, 'NavicIconsTypeParameter', { link = '@field' })
hi(0, 'NavicIconsVariable', { link = '@variable' })
hi(0, 'NavicSeparator', { fg = '#2d4f56' })
hi(0, 'NavicText', { fg = '#e6eaea' })
hi(0, 'NeoTreeDimText', { link = 'Conceal' })
hi(0, 'NeoTreeDirectoryIcon', { fg = '#5a93aa' })
hi(0, 'NeoTreeDirectoryName', { fg = '#5a93aa' })
hi(0, 'NeoTreeDotfile', { fg = '#4d7d90' })
hi(0, 'NeoTreeFileName', { fg = '#cbd9d8' })
hi(0, 'NeoTreeFileNameOpened', { fg = '#e6eaea' })
hi(0, 'NeoTreeGitAdded', { fg = '#7aa4a1' })
hi(0, 'NeoTreeGitConflict', { fg = '#ff8349', italic = true })
hi(0, 'NeoTreeGitDeleted', { fg = '#e85c51' })
hi(0, 'NeoTreeGitIgnored', { fg = '#6d7f8b' })
hi(0, 'NeoTreeGitModified', { fg = '#fda47f' })
hi(0, 'NeoTreeGitUntracked', { fg = '#934e69' })
hi(0, 'NeoTreeIndentMarker', { fg = '#2d4f56' })
hi(0, 'NeoTreeNormal', { fg = '#e6eaea' })
hi(0, 'NeoTreeNormalNC', { link = 'NeoTreeNormal' })
hi(0, 'NeoTreeRootName', { bold = true, fg = '#ff8349' })
hi(0, 'NeoTreeSymbolicLinkTarget', { fg = '#ad6771' })
hi(0, 'NeogitBranch', { fg = '#fda47f' })
hi(0, 'NeogitDiffAdd', { fg = '#7aa4a1' })
hi(0, 'NeogitDiffAddHighlight', { bg = '#293e40' })
hi(0, 'NeogitDiffContextHighlight', { bg = '#1d3337' })
hi(0, 'NeogitDiffDelete', { fg = '#e85c51' })
hi(0, 'NeogitDiffDeleteHighlight', { bg = '#4a3332' })
hi(0, 'NeogitHunkHeader', { bg = '#254147', fg = '#5a93aa' })
hi(0, 'NeogitHunkHeaderHighlight', { bg = '#293e40', fg = '#5a93aa' })
hi(0, 'NeogitNotificationError', { fg = '#e85c51' })
hi(0, 'NeogitNotificationInfo', { fg = '#5a93aa' })
hi(0, 'NeogitNotificationWarning', { fg = '#fda47f' })
hi(0, 'NeogitRemote', { fg = '#7aa4a1' })
hi(0, 'NeotestAdapterName', { bold = true, fg = '#cb7985' })
hi(0, 'NeotestDir', { fg = '#a1cdd8' })
hi(0, 'NeotestExpandMarker', { link = 'Conceal' })
hi(0, 'NeotestFailed', { fg = '#e85c51' })
hi(0, 'NeotestFile', { fg = '#5a93aa' })
hi(0, 'NeotestFocused', { underline = true })
hi(0, 'NeotestIndent', { link = 'Conceal' })
hi(0, 'NeotestMarked', { bold = true, fg = '#e6eaea' })
hi(0, 'NeotestNamespace', { fg = '#89aeb8' })
hi(0, 'NeotestPassed', { fg = '#7aa4a1' })
hi(0, 'NeotestRunning', { fg = '#ff8349' })
hi(0, 'NeotestSkipped', { fg = '#fda47f' })
hi(0, 'NeotestTest', { link = 'Normal' })
hi(0, 'NonText', { fg = '#2d4f56' })
hi(0, 'Normal', { fg = '#e6eaea' })
hi(0, 'NormalFloat', { bg = '#0f1c1e', fg = '#e6eaea' })
hi(0, 'NormalNC', { fg = '#e6eaea' })
hi(0, 'NotifyBackground', { link = 'NormalFloat' })
hi(0, 'NotifyDEBUGBorder', { fg = '#486565' })
hi(0, 'NotifyDEBUGIcon', { link = 'NotifyDEBUGTitle' })
hi(0, 'NotifyDEBUGTitle', { fg = '#7aa4a1' })
hi(0, 'NotifyERRORBorder', { fg = '#7e413d' })
hi(0, 'NotifyERRORIcon', { link = 'NotifyERRORTitle' })
hi(0, 'NotifyERRORTitle', { fg = '#e85c51' })
hi(0, 'NotifyINFOBorder', { fg = '#385c69' })
hi(0, 'NotifyINFOIcon', { link = 'NotifyINFOTitle' })
hi(0, 'NotifyINFOTitle', { fg = '#5a93aa' })
hi(0, 'NotifyTRACEBorder', { fg = '#2d4f56' })
hi(0, 'NotifyTRACEIcon', { link = 'NotifyTRACETitle' })
hi(0, 'NotifyTRACETitle', { fg = '#6d7f8b' })
hi(0, 'NotifyWARNBorder', { fg = '#896554' })
hi(0, 'NotifyWARNIcon', { link = 'NotifyWARNTitle' })
hi(0, 'NotifyWARNTitle', { fg = '#fda47f' })
hi(0, 'Number', { fg = '#ff8349' })
hi(0, 'NvimTreeEmptyFolderName', { fg = '#587b7b' })
hi(0, 'NvimTreeFolderIcon', { fg = '#5a93aa' })
hi(0, 'NvimTreeFolderName', { fg = '#5a93aa' })
hi(0, 'NvimTreeGitDeleted', { fg = '#e85c51' })
hi(0, 'NvimTreeGitDirty', { fg = '#fda47f' })
hi(0, 'NvimTreeGitMerge', { fg = '#ff8349' })
hi(0, 'NvimTreeGitNew', { fg = '#7aa4a1' })
hi(0, 'NvimTreeGitRenamed', { link = 'NvimTreeGitDeleted' })
hi(0, 'NvimTreeGitStaged', { link = 'NvimTreeGitStaged' })
hi(0, 'NvimTreeImageFile', { fg = '#c8c8c8' })
hi(0, 'NvimTreeIndentMarker', { fg = '#2d4f56' })
hi(0, 'NvimTreeNormal', { fg = '#e6eaea' })
hi(0, 'NvimTreeOpenedFile', { fg = '#d38d97' })
hi(0, 'NvimTreeOpenedFolderName', { fg = '#73a3b7' })
hi(0, 'NvimTreeRootFolder', { bold = true, fg = '#ff8349' })
hi(0, 'NvimTreeSpecialFile', { fg = '#a1cdd8' })
hi(0, 'NvimTreeSymlink', { fg = '#ad6771' })
hi(0, 'NvimTreeVertSplit', { link = 'VertSplit' })
hi(0, 'Operator', { fg = '#cbd9d8' })
hi(0, 'Pmenu', { bg = '#293e40', fg = '#e6eaea' })
hi(0, 'PmenuSel', { bg = '#425e5e' })
hi(0, 'PmenuThumb', { bg = '#425e5e' })
hi(0, 'PounceAccept', { bg = '#ff9664', fg = '#152528' })
hi(0, 'PounceAcceptBest', { bg = '#afd4de', fg = '#152528' })
hi(0, 'PounceGap', { bg = '#293e40', fg = '#e6eaea' })
hi(0, 'PounceMatch', { bg = '#425e5e', fg = '#e6eaea' })
hi(0, 'PreProc', { fg = '#d38d97' })
hi(0, 'Question', { link = 'MoreMsg' })
hi(0, 'QuickFixLine', { link = 'CursorLine' })
hi(0, 'RainbowDelimiterBlue', { fg = '#5a93aa' })
hi(0, 'RainbowDelimiterCyan', { fg = '#a1cdd8' })
hi(0, 'RainbowDelimiterGreen', { fg = '#7aa4a1' })
hi(0, 'RainbowDelimiterOrange', { fg = '#ff8349' })
hi(0, 'RainbowDelimiterPurple', { fg = '#ad5c7c' })
hi(0, 'RainbowDelimiterRed', { fg = '#e85c51' })
hi(0, 'RainbowDelimiterYellow', { fg = '#fda47f' })
hi(0, 'Repeat', { link = 'Conditional' })
hi(0, 'Search', { bg = '#425e5e', fg = '#e6eaea' })
hi(0, 'SignColumn', { fg = '#587b7b' })
hi(0, 'SignColumnSB', { link = 'SignColumn' })
hi(0, 'SignifySignAdd', { fg = '#7aa4a1' })
hi(0, 'SignifySignChange', { fg = '#fda47f' })
hi(0, 'SignifySignDelete', { fg = '#e85c51' })
hi(0, 'SnacksBackdrop', { bg = '#000000' })
hi(0, 'SnacksImageMath', { fg = '#73a3b7' })
hi(0, 'SnacksPickerDir', { fg = '#cccccc' })
hi(0, 'Sneak', { bg = '#ad5c7c', fg = '#0f1c1e' })
hi(0, 'SneakScope', { bg = '#293e40' })
hi(0, 'Special', { fg = '#73a3b7' })
hi(0, 'SpecialKey', { link = 'NonText' })
hi(0, 'SpellBad', { sp = '#e85c51', undercurl = true })
hi(0, 'SpellCap', { sp = '#fda47f', undercurl = true })
hi(0, 'SpellLocal', { sp = '#5a93aa', undercurl = true })
hi(0, 'SpellRare', { sp = '#5a93aa', undercurl = true })
hi(0, 'Statement', { fg = '#ad5c7c' })
hi(0, 'StatusLine', { bg = 'none' })
hi(0, 'StatusLineNC', { bg = 'none' })
hi(0, 'String', { fg = '#7aa4a1' })
hi(0, 'Substitute', { bg = '#e85c51', fg = '#152528' })
hi(0, 'SymbolOutlineConnector', { link = 'Conceal' })
hi(0, 'TSRainbowBlue', { fg = '#5a93aa' })
hi(0, 'TSRainbowCyan', { fg = '#a1cdd8' })
hi(0, 'TSRainbowGreen', { fg = '#7aa4a1' })
hi(0, 'TSRainbowOrange', { fg = '#ff8349' })
hi(0, 'TSRainbowRed', { fg = '#e85c51' })
hi(0, 'TSRainbowViolet', { fg = '#ad5c7c' })
hi(0, 'TSRainbowYellow', { fg = '#fda47f' })
hi(0, 'TabLine', { bg = '#1d3337', fg = '#cbd9d8' })
hi(0, 'TablineFill', { bg = 'none' })
hi(0, 'TabLineSel', { bg = '#587b7b', fg = '#152528' })
hi(0, 'TelescopeBorder', { fg = '#2d4f56' })
hi(0, 'TelescopeMatching', { link = 'Search' })
hi(0, 'TelescopeSelection', { link = 'CursorLine' })
hi(0, 'TelescopeSelectionCaret', { fg = '#7aa4a1' })
hi(0, 'Title', { bold = true, fg = '#73a3b7' })
hi(0, 'Todo', { bg = '#5a93aa', fg = '#152528' })
hi(0, 'Type', { fg = '#fda47f' })
hi(0, 'Visual', { bg = '#293e40' })
hi(0, 'WarningMsg', { fg = '#fda47f' })
hi(0, 'WhichKey', { link = 'Identifier' })
hi(0, 'WhichKeyDesc', { link = 'Keyword' })
hi(0, 'WhichKeyFloat', { link = 'NormalFloat' })
hi(0, 'WhichKeyGroup', { link = 'Function' })
hi(0, 'WhichKeySeparator', { link = 'Comment' })
hi(0, 'WhichKeySeperator', { link = 'Comment' })
hi(0, 'WhichKeyValue', { link = 'Comment' })
hi(0, 'Whitespace', { fg = '#254147' })
hi(0, 'WildMenu', { link = 'Pmenu' })
hi(0, 'WinBar', { bold = true, fg = '#587b7b' })
hi(0, 'WinBarNC', { bold = true, fg = '#587b7b' })
hi(0, 'WinSeparator', { fg = '#0f1c1e' })
hi(0, 'diffAdded', { fg = '#7aa4a1' })
hi(0, 'diffChanged', { fg = '#fda47f' })
hi(0, 'diffFile', { fg = '#5a93aa' })
hi(0, 'diffIndexLine', { fg = '#d38d97' })
hi(0, 'diffLine', { fg = '#ff9664' })
hi(0, 'diffNewFile', { fg = '#7aa4a1' })
hi(0, 'diffOldFile', { fg = '#fda47f' })
hi(0, 'diffRemoved', { fg = '#e85c51' })
hi(0, 'illuminatedWordRead', { link = 'LspReferenceText' })
hi(0, 'illuminatedWordText', { link = 'LspReferenceText' })
hi(0, 'illuminatedWordWrite', { link = 'LspReferenceText' })
hi(0, 'lCursor', { link = 'Cursor' })
hi(0, 'qfFileName', { link = 'Directory' })
hi(0, 'qfLineNr', { link = 'LineNr' })
hi(0, 'rainbowcol1', { fg = '#e85c51' })
hi(0, 'rainbowcol2', { fg = '#fda47f' })
hi(0, 'rainbowcol3', { fg = '#7aa4a1' })
hi(0, 'rainbowcol4', { fg = '#5a93aa' })
hi(0, 'rainbowcol5', { fg = '#a1cdd8' })
hi(0, 'rainbowcol6', { fg = '#ad5c7c' })
hi(0, 'rainbowcol7', { fg = '#cb7985' })
hi(0, 'typescriptParens', { fg = '#cbd9d8' })
-- Terminal colors
local g = vim.g
g.terminal_color_0 = '#2f3239'
g.terminal_color_1 = '#e85c51'
g.terminal_color_2 = '#7aa4a1'
g.terminal_color_3 = '#fda47f'
g.terminal_color_4 = '#5a93aa'
g.terminal_color_5 = '#ad5c7c'
g.terminal_color_6 = '#a1cdd8'
g.terminal_color_7 = '#ebebeb'
g.terminal_color_8 = '#4e5157'
g.terminal_color_9 = '#eb746b'
g.terminal_color_10 = '#8eb2af'
g.terminal_color_11 = '#fdb292'
g.terminal_color_12 = '#73a3b7'
g.terminal_color_13 = '#b97490'
g.terminal_color_14 = '#afd4de'
g.terminal_color_15 = '#eeeeee'

1
nvim/lsp/gopls.lua
View file

@ -1,3 +1,4 @@
---@type vim.lsp.Config
return { return {
settings = { settings = {
gopls = { gopls = {

8
nvim/lsp/lua_ls.lua
View file

@ -18,6 +18,12 @@ return {
}) })
end, end,
settings = { settings = {
Lua = {}, Lua = {
hint = {
enable = true,
arrayIndex = 'Enable',
setType = true,
},
},
}, },
} }

7
nvim/lua/config/init.lua
View file

@ -24,6 +24,7 @@ vim.opt.tabstop = 2 -- 2 space tabs are based
vim.opt.updatetime = 250 -- decrease update time vim.opt.updatetime = 250 -- decrease update time
vim.opt.virtualedit = 'onemore' vim.opt.virtualedit = 'onemore'
vim.opt.winborder = 'single' vim.opt.winborder = 'single'
vim.cmd('colorscheme iofq')
-- Switch tab length on the fly -- Switch tab length on the fly
vim.keymap.set('n', '\\t', function() vim.keymap.set('n', '\\t', function()
@ -44,7 +45,7 @@ vim.api.nvim_create_autocmd('BufWinEnter', {
if vim.bo[event.buf].filetype == 'help' then if vim.bo[event.buf].filetype == 'help' then
vim.cmd.only() vim.cmd.only()
vim.keymap.set('n', 'q', vim.cmd.bdelete, { noremap = true, silent = true }) vim.keymap.set('n', 'q', vim.cmd.bdelete, { noremap = true, silent = true })
vim.bo.buflisted = true vim.bo.buflisted = false
end end
end, end,
}) })
@ -87,6 +88,10 @@ vim.keymap.set('n', '<S-h>', vim.cmd.bprev, { noremap = true, silent = true })
vim.keymap.set('v', '<', '<gv') vim.keymap.set('v', '<', '<gv')
vim.keymap.set('v', '>', '>gv') vim.keymap.set('v', '>', '>gv')
vim.keymap.set({ 'v', 'n' }, 'q:', '<nop>') vim.keymap.set({ 'v', 'n' }, 'q:', '<nop>')
vim.keymap.set('n', 'gq', vim.cmd.bdelete, { noremap = true, silent = true, desc = 'close buffer' })
vim.keymap.set('n', 'gQ', function()
vim.cmd('bufdo bdelete')
end, { noremap = true, silent = true, desc = 'close all buffers' })
-- resize splits if window got resized -- resize splits if window got resized
vim.api.nvim_create_autocmd({ 'VimResized' }, { vim.api.nvim_create_autocmd({ 'VimResized' }, {

52
nvim/lua/plugins/lib/minidiff_jj.lua
View file

@ -1,14 +1,14 @@
local diff = require('mini.diff') local diff = require('mini.diff')
local JJ = { local M = {
cache = {}, cache = {},
jj_cache = {}, jj_cache = {},
} }
JJ.get_buf_realpath = function(buf_id) M.get_buf_realpath = function(buf_id)
return vim.loop.fs_realpath(vim.api.nvim_buf_get_name(buf_id)) or '' return vim.loop.fs_realpath(vim.api.nvim_buf_get_name(buf_id)) or ''
end end
JJ.jj_start_watching_tree_state = function(buf_id, path) M.jj_start_watching_tree_state = function(buf_id, path)
local stdout = vim.loop.new_pipe() local stdout = vim.loop.new_pipe()
local args = { 'workspace', 'root', '--ignore-working-copy' } local args = { 'workspace', 'root', '--ignore-working-copy' }
local spawn_opts = { local spawn_opts = {
@ -19,11 +19,11 @@ JJ.jj_start_watching_tree_state = function(buf_id, path)
local on_not_in_jj = vim.schedule_wrap(function() local on_not_in_jj = vim.schedule_wrap(function()
if not vim.api.nvim_buf_is_valid(buf_id) then if not vim.api.nvim_buf_is_valid(buf_id) then
JJ.cache[buf_id] = nil M.cache[buf_id] = nil
return return
end end
diff.fail_attach(buf_id) diff.fail_attach(buf_id)
JJ.jj_cache[buf_id] = {} M.jj_cache[buf_id] = {}
end) end)
local process, stdout_feed = nil, {} local process, stdout_feed = nil, {}
@ -37,20 +37,20 @@ JJ.jj_start_watching_tree_state = function(buf_id, path)
-- Set up index watching -- Set up index watching
local jj_dir_path = table.concat(stdout_feed, ''):gsub('\n+$', '') .. '/.jj/working_copy' local jj_dir_path = table.concat(stdout_feed, ''):gsub('\n+$', '') .. '/.jj/working_copy'
JJ.jj_setup_tree_state_watch(buf_id, jj_dir_path) M.jj_setup_tree_state_watch(buf_id, jj_dir_path)
-- Set reference text immediately -- Set reference text immediately
JJ.jj_set_ref_text(buf_id) M.jj_set_ref_text(buf_id)
end end
process = vim.loop.spawn('jj', spawn_opts, on_exit) process = vim.loop.spawn('jj', spawn_opts, on_exit)
JJ.jj_read_stream(stdout, stdout_feed) M.jj_read_stream(stdout, stdout_feed)
end end
JJ.jj_setup_tree_state_watch = function(buf_id, jj_dir_path) M.jj_setup_tree_state_watch = function(buf_id, jj_dir_path)
local buf_fs_event, timer = vim.loop.new_fs_event(), vim.loop.new_timer() local buf_fs_event, timer = vim.loop.new_fs_event(), vim.loop.new_timer()
local buf_jj_set_ref_text = function() local buf_jj_set_ref_text = function()
JJ.jj_set_ref_text(buf_id) M.jj_set_ref_text(buf_id)
end end
local watch_tree_state = function(_, filename, _) local watch_tree_state = function(_, filename, _)
@ -63,11 +63,11 @@ JJ.jj_setup_tree_state_watch = function(buf_id, jj_dir_path)
end end
buf_fs_event:start(jj_dir_path, { recursive = false }, watch_tree_state) buf_fs_event:start(jj_dir_path, { recursive = false }, watch_tree_state)
JJ.jj_invalidate_cache(JJ.jj_cache[buf_id]) M.jj_invalidate_cache(M.jj_cache[buf_id])
JJ.jj_cache[buf_id] = { fs_event = buf_fs_event, timer = timer } M.jj_cache[buf_id] = { fs_event = buf_fs_event, timer = timer }
end end
JJ.jj_set_ref_text = vim.schedule_wrap(function(buf_id) M.jj_set_ref_text = vim.schedule_wrap(function(buf_id)
if not vim.api.nvim_buf_is_valid(buf_id) then if not vim.api.nvim_buf_is_valid(buf_id) then
return return
end end
@ -77,7 +77,7 @@ JJ.jj_set_ref_text = vim.schedule_wrap(function(buf_id)
end) end)
-- NOTE: Do not cache buffer's name to react to its possible rename -- NOTE: Do not cache buffer's name to react to its possible rename
local path = JJ.get_buf_realpath(buf_id) local path = M.get_buf_realpath(buf_id)
if path == '' then if path == '' then
return buf_set_ref_text {} return buf_set_ref_text {}
end end
@ -105,10 +105,10 @@ JJ.jj_set_ref_text = vim.schedule_wrap(function(buf_id)
end end
process = vim.loop.spawn('jj', spawn_opts, on_exit) process = vim.loop.spawn('jj', spawn_opts, on_exit)
JJ.jj_read_stream(stdout, stdout_feed) M.jj_read_stream(stdout, stdout_feed)
end) end)
JJ.jj_read_stream = function(stream, feed) M.jj_read_stream = function(stream, feed)
local callback = function(err, data) local callback = function(err, data)
if data ~= nil then if data ~= nil then
return table.insert(feed, data) return table.insert(feed, data)
@ -121,7 +121,7 @@ JJ.jj_read_stream = function(stream, feed)
stream:read_start(callback) stream:read_start(callback)
end end
JJ.jj_invalidate_cache = function(cache) M.jj_invalidate_cache = function(cache)
if cache == nil then if cache == nil then
return return
end end
@ -129,26 +129,26 @@ JJ.jj_invalidate_cache = function(cache)
pcall(vim.loop.timer_stop, cache.timer) pcall(vim.loop.timer_stop, cache.timer)
end end
local jj = function() M.gen_source = function()
local attach = function(buf_id) local attach = function(buf_id)
-- Try attaching to a buffer only once -- Try attaching to a buffer only once
if JJ.jj_cache[buf_id] ~= nil then if M.jj_cache[buf_id] ~= nil then
return false return false
end end
-- - Possibly resolve symlinks to get data from the original repo -- - Possibly resolve symlinks to get data from the original repo
local path = JJ.get_buf_realpath(buf_id) local path = M.get_buf_realpath(buf_id)
if path == '' then if path == '' then
return false return false
end end
JJ.jj_cache[buf_id] = {} M.jj_cache[buf_id] = {}
JJ.jj_start_watching_tree_state(buf_id, path) M.jj_start_watching_tree_state(buf_id, path)
end end
local detach = function(buf_id) local detach = function(buf_id)
local cache = JJ.jj_cache[buf_id] local cache = M.jj_cache[buf_id]
JJ.jj_cache[buf_id] = nil M.jj_cache[buf_id] = nil
JJ.jj_invalidate_cache(cache) M.jj_invalidate_cache(cache)
end end
local apply_hunks = function(_, _) local apply_hunks = function(_, _)
@ -162,4 +162,4 @@ local jj = function()
apply_hunks = apply_hunks, apply_hunks = apply_hunks,
} }
end end
return jj return M

54
nvim/lua/plugins/lib/session_jj.lua
View file

@ -1,7 +1,8 @@
local M = {} local M = {}
M.load = function() sessions = require('mini.sessions')
M.get_id = function()
local jj_root = vim.system({ 'jj', 'workspace', 'root' }):wait() local jj_root = vim.system({ 'jj', 'workspace', 'root' }):wait()
local sessions = require('mini.sessions')
if jj_root.code ~= 0 then if jj_root.code ~= 0 then
return return
@ -19,29 +20,42 @@ M.load = function()
'--no-graph', '--no-graph',
}) })
:wait() :wait()
local branch = vim.trim(string.gsub(result.stdout, '[\n*]', '')) local branch = vim.trim(string.gsub(result.stdout, '[\n*]', '')) -- trim newlines and unpushed indicator
local root = vim.trim(string.gsub(jj_root.stdout, '\n', '')) local root = vim.trim(string.gsub(jj_root.stdout, '\n', ''))
local jj_sesh = string.gsub(string.format('jj:%s:%s', root, branch), '[./]', '-') local id = string.gsub(string.format('jj:%s:%s', root, branch), '[./]', '-') -- slugify
if jj_sesh ~= '' then return id
vim.opt.shadafile = vim.fn.stdpath('data') .. '/myshada/' .. jj_sesh .. '.shada'
for name, _ in pairs(sessions.detected) do
if name == jj_sesh then
vim.ui.select({
'No',
'Yes',
}, { prompt = 'Session found at ' .. jj_sesh .. ', load it?' }, function(c)
if c == 'Yes' then
-- load session (buffers, etc) as well as shada (marks)
sessions.read(jj_sesh)
vim.cmd('rshada')
vim.notify('loaded jj session: ' .. jj_sesh)
end end
end)
M.check_exists = function(id)
for name, _ in pairs(sessions.detected) do
if name == id then
return true
end
end
return false
end
M.load = function()
local id = M.get_id()
if id == '' then
return return
end end
vim.opt.shadafile = vim.fn.stdpath('data') .. '/myshada/' .. id .. '.shada'
if M.check_exists(id) then
vim.ui.select({
'Yes',
'No',
}, { prompt = 'Session found at ' .. id .. ', load it?' }, function(c)
if c == 'Yes' then
-- load session (buffers, etc) as well as shada (marks)
sessions.read(id)
vim.cmd('rshada')
vim.notify('loaded jj session: ' .. id)
end end
vim.cmd('wshada') end)
sessions.write(jj_sesh) else
vim.cmd('wshada') -- create session if it did not exist
sessions.write(id)
end end
end end

26
nvim/lua/plugins/lib/snacks.lua Normal file
View file

@ -0,0 +1,26 @@
M = {}
M.marks = function()
return {
finder = 'vim_marks',
format = 'file',
['local'] = false,
global = true,
actions = {
markdel = function(picker)
for _, item in ipairs(picker:selected()) do
vim.cmd.delmarks { args = { item.label } }
end
vim.cmd('wshada')
picker.list:set_selected()
picker.list:set_target()
picker:find()
end,
},
win = {
list = {
keys = { ['dd'] = 'markdel' },
},
},
}
end
return M

1
nvim/lua/plugins/lib/snacks_jj.lua
View file

@ -67,6 +67,7 @@ function M.revs()
Snacks.picker.util.cmd(cmd, function() Snacks.picker.util.cmd(cmd, function()
Snacks.notify('Checking out revision: ' .. item.rev, { title = 'Snacks Picker' }) Snacks.notify('Checking out revision: ' .. item.rev, { title = 'Snacks Picker' })
vim.cmd.checktime() vim.cmd.checktime()
require('plugins.lib.session_jj').load()
end, { cwd = item.cwd }) end, { cwd = item.cwd })
end end
end end

54
nvim/lua/plugins/lsp.lua
View file

@ -8,7 +8,7 @@ return {
follow = false, follow = false,
auto_close = false, auto_close = false,
win = { win = {
size = 0.25, size = 0.33,
position = 'right', position = 'right',
type = 'split', type = 'split',
}, },
@ -17,7 +17,6 @@ return {
{ {
'gre', 'gre',
'<cmd>Trouble diagnostics toggle<CR>', '<cmd>Trouble diagnostics toggle<CR>',
noremap = true,
desc = 'Trouble diagnostics', desc = 'Trouble diagnostics',
}, },
}, },
@ -25,10 +24,6 @@ return {
{ {
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
event = 'VeryLazy', event = 'VeryLazy',
dependencies = {
'folke/trouble.nvim',
'saghen/blink.cmp',
},
config = function() config = function()
vim.lsp.enable { vim.lsp.enable {
'nil_ls', 'nil_ls',
@ -40,53 +35,36 @@ return {
vim.api.nvim_create_autocmd('LspAttach', { vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('UserLspConfig', {}), group = vim.api.nvim_create_augroup('UserLspConfig', {}),
callback = function(ev) callback = function(ev)
local bufnr = ev.buf
local client = vim.lsp.get_client_by_id(ev.data.client_id) local client = vim.lsp.get_client_by_id(ev.data.client_id)
if not client then if not client then
return return
end end
vim.keymap.set('n', 'grg', '<cmd>Trouble lsp toggle<CR>', { buffer = ev.buf, desc = 'Trouble LSP' })
vim.keymap.set( vim.keymap.set(
'n', 'n',
'grt', 'gO',
'<cmd>Trouble lsp toggle focus=true <CR>', '<cmd>Trouble lsp_document_symbols win.position=left<CR>',
{ buffer = ev.buf, noremap = true, silent = true, desc = 'Trouble LSP ' } { buffer = ev.buf, desc = 'Trouble LSP symbols' }
)
vim.keymap.set(
'n',
'grs',
'<cmd>Trouble lsp_document_symbols toggle win.position=left <CR>',
{ buffer = ev.buf, noremap = true, silent = true, desc = 'Trouble LSP symbols' }
)
vim.keymap.set(
'n',
'grd',
'<cmd>Trouble lsp_definitions toggle <CR>',
{ buffer = ev.buf, noremap = true, silent = true, desc = 'Trouble LSP definition' }
)
vim.keymap.set(
'n',
'grr',
'<cmd>Trouble lsp_references toggle <CR>',
{ buffer = ev.buf, noremap = true, silent = true, desc = 'Trouble LSP definition' }
)
vim.keymap.set(
'n',
'grl',
vim.lsp.codelens.run,
{ buffer = ev.buf, noremap = true, silent = true, desc = 'vim.lsp.codelens.run()' }
) )
vim.keymap.set('n', 'grd', function()
Snacks.picker.lsp_definitions { focus = 'list' }
end, { buffer = ev.buf, desc = 'LSP definition' })
vim.keymap.set('n', 'grr', function()
Snacks.picker.lsp_references { focus = 'list' }
end, { buffer = ev.buf, desc = 'LSP definition' })
vim.keymap.set('n', 'grh', function() vim.keymap.set('n', 'grh', function()
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
end, { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP hints toggle' }) end, { buffer = ev.buf, desc = 'LSP hints toggle' })
vim.keymap.set('n', 'grl', vim.lsp.codelens.run, { buffer = ev.buf, desc = 'vim.lsp.codelens.run()' })
-- Auto-refresh code lenses -- Auto-refresh code lenses
if client.server_capabilities.codeLensProvider then if client.server_capabilities.codeLensProvider then
vim.api.nvim_create_autocmd({ 'InsertLeave', 'TextChanged' }, { vim.api.nvim_create_autocmd({ 'InsertLeave', 'TextChanged' }, {
group = vim.api.nvim_create_augroup(string.format('lsp-%s-%s', bufnr, client.id), {}), group = vim.api.nvim_create_augroup(string.format('lsp-%s-%s', ev.buf, client.id), {}),
callback = function() callback = function()
vim.lsp.codelens.refresh { bufnr = bufnr } vim.lsp.codelens.refresh { bufnr = ev.buf }
end, end,
buffer = bufnr, buffer = ev.buf,
}) })
vim.lsp.codelens.refresh() vim.lsp.codelens.refresh()
end end

34
nvim/lua/plugins/mini.lua
View file

@ -1,7 +1,6 @@
return { return {
{ {
'echasnovski/mini.nvim', 'echasnovski/mini.nvim',
dependencies = 'nvim-treesitter/nvim-treesitter-textobjects',
lazy = false, lazy = false,
keys = { keys = {
{ {
@ -23,13 +22,11 @@ return {
{ {
'<leader>gb', '<leader>gb',
'<Cmd>Git blame -- %<CR>', '<Cmd>Git blame -- %<CR>',
noremap = true,
desc = 'git blame', desc = 'git blame',
}, },
{ {
'<leader>gg', '<leader>gg',
':Git ', ':Git ',
noremap = true,
desc = 'git command', desc = 'git command',
}, },
{ {
@ -40,6 +37,13 @@ return {
noremap = true, noremap = true,
desc = 'mini session select', desc = 'mini session select',
}, },
{
'\\z',
function()
require('mini.misc').zoom()
end,
desc = 'mini zoom',
},
}, },
config = function() config = function()
require('mini.basics').setup { mappings = { windows = true } } require('mini.basics').setup { mappings = { windows = true } }
@ -99,16 +103,17 @@ return {
require('mini.surround').setup() require('mini.surround').setup()
require('mini.splitjoin').setup { detect = { separator = '[,;\n]' } } require('mini.splitjoin').setup { detect = { separator = '[,;\n]' } }
local sessions = require('mini.sessions') require('mini.sessions').setup {
sessions.setup {
file = '', file = '',
autowrite = true, autowrite = true,
verbose = { verbose = {
write = false, write = false,
}, },
} }
if #vim.fn.argv() == 0 then local jj_sesh = require('plugins.lib.session_jj')
require('plugins.lib.session_jj').load() local jj_id = jj_sesh.get_id()
if jj_sesh.check_exists(jj_id) then
Snacks.notify('Existing session for ' .. jj_id)
end end
local jump = require('mini.jump2d') local jump = require('mini.jump2d')
@ -130,7 +135,7 @@ return {
diff.setup { diff.setup {
options = { wrap_goto = true }, options = { wrap_goto = true },
source = { source = {
jj(), jj.gen_source(),
diff.gen_source.git(), diff.gen_source.git(),
}, },
} }
@ -170,10 +175,14 @@ return {
width_preview = 50, width_preview = 50,
}, },
} }
vim.keymap.set('n', '<leader>nc', files.open, { noremap = true, desc = 'minifiles open' }) vim.keymap.set('n', '<leader>nc', files.open, { desc = 'minifiles open' })
vim.api.nvim_create_autocmd('User', { vim.api.nvim_create_autocmd('User', {
pattern = 'MiniFilesBufferCreate', pattern = 'MiniFilesBufferCreate',
callback = function(args) callback = function(args)
vim.keymap.set('n', '<leader>nc', function()
files.synchronize()
files.close()
end, { buffer = args.data.buf_id })
vim.keymap.set('n', '`', function() vim.keymap.set('n', '`', function()
local cur_entry_path = MiniFiles.get_fs_entry().path local cur_entry_path = MiniFiles.get_fs_entry().path
local cur_directory = vim.fs.dirname(cur_entry_path) local cur_directory = vim.fs.dirname(cur_entry_path)
@ -181,7 +190,12 @@ return {
end, { buffer = args.data.buf_id }) end, { buffer = args.data.buf_id })
end, end,
}) })
vim.api.nvim_create_autocmd('User', {
pattern = 'MiniFilesActionRename',
callback = function(event)
Snacks.rename.on_rename_file(event.data.from, event.data.to)
end,
})
local multi = require('mini.keymap').map_multistep local multi = require('mini.keymap').map_multistep
multi({ 'i' }, '<BS>', { 'minipairs_bs' }) multi({ 'i' }, '<BS>', { 'minipairs_bs' })
multi({ 'i', 's' }, '<Tab>', { 'blink_accept', 'vimsnippet_next', 'increase_indent' }) multi({ 'i', 's' }, '<Tab>', { 'blink_accept', 'vimsnippet_next', 'increase_indent' })

34
nvim/lua/plugins/misc.lua
View file

@ -39,53 +39,21 @@ return {
}, },
}, },
keys = { keys = {
{ '<leader>nb', vim.cmd.DiffviewOpen, noremap = true, desc = 'diffview open' }, { '<leader>nb', vim.cmd.DiffviewOpen, desc = 'diffview open' },
{ {
'<leader>nh', '<leader>nh',
'<cmd>DiffviewFileHistory %<cr>', '<cmd>DiffviewFileHistory %<cr>',
mode = { 'n', 'v' }, mode = { 'n', 'v' },
noremap = true,
desc = 'diffview history', desc = 'diffview history',
}, },
{ {
'<leader>nH', '<leader>nH',
'<cmd>DiffviewFileHistory<cr>', '<cmd>DiffviewFileHistory<cr>',
mode = { 'n', 'v' }, mode = { 'n', 'v' },
noremap = true,
desc = 'diffview history', desc = 'diffview history',
}, },
}, },
}, },
{
'EdenEast/nightfox.nvim',
lazy = false,
priority = 1000,
opts = {
options = {
transparent = true,
terminal_colors = true,
modules = {
'mini',
'treesitter',
'neogit',
'native_lsp',
'diagnostic',
'modes',
},
},
},
config = function(_, opts)
require('nightfox').setup(opts)
vim.cmd('colorscheme terafox')
vim.api.nvim_set_hl(0, 'StatusLine', { bg = 'none' })
vim.api.nvim_set_hl(0, 'StatusLineNC', { bg = 'none' })
vim.api.nvim_set_hl(0, 'TablineFill', { bg = 'none' })
vim.api.nvim_set_hl(0, 'MiniDiffSignAdd', { fg = 'green', bold = true })
vim.api.nvim_set_hl(0, 'MiniDiffSignDelete', { fg = 'red', bold = true })
vim.api.nvim_set_hl(0, 'MiniDiffSignChange', { fg = 'green', bold = true })
vim.api.nvim_set_hl(0, 'BlinkCmpGhostText', { link = 'String' })
end,
},
{ {
'ThePrimeagen/refactoring.nvim', 'ThePrimeagen/refactoring.nvim',
event = 'VeryLazy', event = 'VeryLazy',

142
nvim/lua/plugins/snacks.lua
View file

@ -1,47 +1,53 @@
return { return {
{ {
'folke/snacks.nvim', 'folke/snacks.nvim',
dependencies = {
'folke/trouble.nvim',
},
lazy = false, lazy = false,
priority = 1000, priority = 1000,
opts = { opts = {
bigfile = { enabled = true }, bigfile = { enabled = true },
bufdelete = { enabled = true },
quickfile = { enabled = true }, quickfile = { enabled = true },
notifier = { enabled = true }, notifier = {
enabled = true,
timeout = 5000,
},
styles = {
notification = {
wo = { wrap = true },
},
},
terminal = { enabled = true }, terminal = { enabled = true },
indent = { enabled = true }, indent = { enabled = true },
input = { enabled = true }, input = { enabled = true },
words = { enabled = true }, words = { enabled = true },
picker = { picker = {
enabled = true, enabled = true,
matcher = { frecency = true }, matcher = {
layout = { frecency = true,
preset = function() history_bonus = true,
return vim.o.columns >= 120 and 'telescope' or 'vertical'
end,
}, },
layout = 'ivy_split',
sources = { sources = {
files = { hidden = true }, files = { hidden = true },
grep = { hidden = true }, grep = { hidden = true },
explorer = { hidden = true }, explorer = { hidden = true },
git_files = { untracked = true }, git_files = { untracked = true },
lsp_symbols = {
filter = { default = true },
layout = 'left',
},
smart = { smart = {
multi = { 'buffers', 'recent', 'files' }, multi = {
require('plugins.lib.snacks').marks(),
{ source = 'buffers', current = false },
'recent',
{ source = 'files', hidden = true },
}, },
}, },
actions = {
trouble_open = function(...)
return require('trouble.sources.snacks').actions.trouble_open.action(...)
end,
}, },
win = { win = {
input = { input = {
keys = { keys = {
['wq'] = { 'close', mode = 'i' }, ['wq'] = { 'close', mode = 'i' },
['<c-t>'] = { 'trouble_open', mode = { 'n', 'i' } },
}, },
}, },
list = { list = {
@ -52,10 +58,6 @@ return {
}, },
}, },
}, },
config = function(_, opts)
require('snacks').setup(opts)
vim.api.nvim_set_hl(0, 'SnacksPickerDir', { fg = '#cccccc' })
end,
keys = { keys = {
{ {
'<C-\\>', '<C-\\>',
@ -63,7 +65,6 @@ return {
Snacks.terminal.toggle() Snacks.terminal.toggle()
end, end,
mode = { 'n', 't' }, mode = { 'n', 't' },
noremap = true,
desc = 'terminal open', desc = 'terminal open',
}, },
{ {
@ -72,7 +73,6 @@ return {
Snacks.terminal.toggle('$SHELL') Snacks.terminal.toggle('$SHELL')
end, end,
mode = { 'n', 't' }, mode = { 'n', 't' },
noremap = true,
desc = 'terminal open', desc = 'terminal open',
}, },
{ {
@ -80,7 +80,6 @@ return {
function() function()
Snacks.words.jump(1, true) Snacks.words.jump(1, true)
end, end,
noremap = true,
desc = 'next reference', desc = 'next reference',
}, },
{ {
@ -88,51 +87,21 @@ return {
function() function()
Snacks.words.jump(-1, true) Snacks.words.jump(-1, true)
end, end,
noremap = true,
desc = 'next reference', desc = 'next reference',
}, },
{ {
'\\z', '<leader><leader>',
function()
if Snacks.dim.enabled then
Snacks.dim.disable()
else
Snacks.dim.enable()
end
end,
noremap = true,
desc = 'next reference',
},
{
'gq',
function()
Snacks.bufdelete()
end,
noremap = true,
silent = true,
},
{
'gQ',
function()
Snacks.bufdelete.other()
end,
noremap = true,
silent = true,
},
{
'<leader>ff',
function() function()
vim.cmd.delmarks { args = { '0-9' } }
Snacks.picker.smart() Snacks.picker.smart()
end, end,
noremap = true, desc = 'Fuzzy find smart',
desc = 'Fuzzy find files',
}, },
{ {
'<leader>fe', '<leader>fe',
function() function()
Snacks.explorer() Snacks.explorer()
end, end,
noremap = true,
desc = 'snacks explorer', desc = 'snacks explorer',
}, },
{ {
@ -140,8 +109,13 @@ return {
function() function()
Snacks.picker.git_files() Snacks.picker.git_files()
end, end,
noremap = true, desc = 'Fuzzy find git files',
silent = true, },
{
'<leader>ff',
function()
Snacks.picker.files()
end,
desc = 'Fuzzy find files', desc = 'Fuzzy find files',
}, },
{ {
@ -149,8 +123,6 @@ return {
function() function()
Snacks.picker.grep() Snacks.picker.grep()
end, end,
noremap = true,
silent = true,
desc = 'Fuzzy find grep', desc = 'Fuzzy find grep',
}, },
{ {
@ -158,8 +130,6 @@ return {
function() function()
Snacks.picker.grep_word() Snacks.picker.grep_word()
end, end,
noremap = true,
silent = true,
desc = 'Fuzzy find grep word', desc = 'Fuzzy find grep word',
}, },
{ {
@ -167,8 +137,6 @@ return {
function() function()
Snacks.picker.pickers() Snacks.picker.pickers()
end, end,
noremap = true,
silent = true,
desc = 'See all pickers', desc = 'See all pickers',
}, },
{ {
@ -176,8 +144,6 @@ return {
function() function()
Snacks.picker.undo() Snacks.picker.undo()
end, end,
noremap = true,
silent = true,
desc = 'Pick undotree', desc = 'Pick undotree',
}, },
{ {
@ -185,8 +151,6 @@ return {
function() function()
Snacks.picker.jumps() Snacks.picker.jumps()
end, end,
noremap = true,
silent = true,
desc = 'Pick jumps', desc = 'Pick jumps',
}, },
{ {
@ -194,17 +158,13 @@ return {
function() function()
Snacks.picker.resume() Snacks.picker.resume()
end, end,
noremap = true,
silent = true,
desc = 'Fuzzy find resume', desc = 'Fuzzy find resume',
}, },
{ {
'<leader><leader>', '<leader>fb',
function() function()
Snacks.picker.buffers() Snacks.picker.buffers()
end, end,
noremap = true,
silent = true,
desc = 'Fuzzy find buffers', desc = 'Fuzzy find buffers',
}, },
{ {
@ -212,44 +172,14 @@ return {
function() function()
Snacks.picker.notifications() Snacks.picker.notifications()
end, end,
noremap = true,
silent = true,
desc = 'pick notifications', desc = 'pick notifications',
}, },
{ {
'<leader>fm', '<leader>fm',
function() function()
vim.cmd.delmarks { args = { '0-9' } } vim.cmd.delmarks { args = { '0-9' } }
Snacks.picker.pick { Snacks.picker.pick(require('plugins.lib.snacks').marks())
finder = 'vim_marks',
format = 'file',
['local'] = false,
global = true,
actions = {
markdel = function(picker)
for _, item in ipairs(picker:selected()) do
vim.cmd.delmarks { args = { item.label } }
end
vim.cmd('wshada')
picker.list:set_selected()
picker.list:set_target()
picker:find()
end, end,
},
win = {
input = {
keys = {
['<c-x>'] = { 'markdel', mode = { 'n', 'i' } },
},
},
list = {
keys = { ['dd'] = 'markdel' },
},
},
}
end,
noremap = true,
silent = true,
desc = 'pick global marks', desc = 'pick global marks',
}, },
{ {
@ -257,8 +187,6 @@ return {
function() function()
require('plugins.lib.snacks_jj').status() require('plugins.lib.snacks_jj').status()
end, end,
noremap = true,
silent = true,
desc = 'pick notifications', desc = 'pick notifications',
}, },
{ {
@ -266,8 +194,6 @@ return {
function() function()
require('plugins.lib.snacks_jj').revs() require('plugins.lib.snacks_jj').revs()
end, end,
noremap = true,
silent = true,
desc = 'pick notifications', desc = 'pick notifications',
}, },
}, },

8
nvim/lua/plugins/treesitter.lua
View file

@ -11,6 +11,7 @@ return {
}, },
}, },
'nvim-treesitter/nvim-treesitter-textobjects', 'nvim-treesitter/nvim-treesitter-textobjects',
'RRethy/nvim-treesitter-textsubjects',
}, },
config = function() config = function()
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {
@ -49,13 +50,6 @@ return {
}, },
}, },
}, },
incremental_selection = {
enable = true,
keymaps = {
node_incremental = 'v',
node_decremental = '<S-TAB>',
},
},
} }
end, end,
}, },