diff --git a/flake.lock b/flake.lock index bc2a88a..d493c56 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1741068816, - "narHash": "sha256-JvaktGlQ/j+7+sbcl1OHcQmht7w+7AGDVmHldCezUkc=", + "lastModified": 1743025451, + "narHash": "sha256-5gqfQwTpOIHWSltdm5tKbyOvnTll81lGSiuC2EsVZt0=", "owner": "cachix", "repo": "devenv", - "rev": "9f6da63c162ad86b6fb84edcbd8c447fdc411c3d", + "rev": "686aaf88c9c095fc49dadc620d1a814830c78206", "type": "github" }, "original": { @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1734114420, - "narHash": "sha256-n52PUzub5jZWc8nI/sR7UICOheU8rNA+YZ73YaHeCBg=", + "lastModified": 1741798497, + "narHash": "sha256-E3j+3MoY8Y96mG1dUIiLFm2tZmNbRvSiyN7CrSKuAVg=", "owner": "domenkozar", "repo": "nix", - "rev": "bde6a1a0d1f2af86caa4d20d23eca019f3d57eee", + "rev": "f3f44b2baaf6c4c6e179de8cbb1cc6db031083cd", "type": "github" }, "original": { @@ -220,12 +220,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", - "revCount": 762036, + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "revCount": 770807, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.762036%2Brev-ba487dbc9d04e0634c64e3b1f0d25839a0a68246/01955dcf-a7b5-755d-a798-11672ffd8be2/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.770807%2Brev-a84ebe20c6bc2ecbcfb000a50776219f48d134cc/0195b626-8c1d-7fb9-9282-563af3d37ab9/source.tar.gz" }, "original": { "type": "tarball", diff --git a/nix/home-manager/modules/packages/neovim.nix b/nix/home-manager/modules/packages/neovim.nix index 48e20b5..b7b8c43 100644 --- a/nix/home-manager/modules/packages/neovim.nix +++ b/nix/home-manager/modules/packages/neovim.nix @@ -98,15 +98,6 @@ yamlls.enable = true; }; }; - lspkind = { - enable = true; - mode = "symbol"; - # cmp.enable = true; - symbolMap = { - # TODO - "Text" = ""; - }; - }; mini = { enable = true; modules = { @@ -154,7 +145,10 @@ nerd_font_variant = "mono"; }; completion = { - ghost_text.enabled = true; + ghost_text = { + enabled = true; + show_with_menu = false; + }; accept = { auto_brackets = { enabled = true; @@ -167,7 +161,20 @@ }; }; menu = { - # draw == colorful-menu.nvim config + draw = { + columns.__raw = "{ { 'kind_icon' }, {'label', gap = 1 } }"; + components = { + label.__raw = '' + { + text = function(ctx) + return require('colorful-menu').blink_components_text(ctx) + end, + highlight = function(ctx) + return require('colorful-menu').blink_components_highlight(ctx) + end, + }''; + }; + }; }; }; signature = { @@ -284,15 +291,15 @@ ts-context-commentstring = { enable = true; }; - # ufo = { # TODO - # enable = true; - # extraLua.pre = '' - # require('ufo').setup({ provider_selector = function(bufnr, filetype, buftype) - # return {'treesitter', 'indent' } - # end - # }) - # ''; - # }; + overseer = { + enable = true; + }; + nvim-ufo = { + enable = true; + }; + rainbow-delimiters = { + enable = true; + }; vim-bbye = { enable = true; }; @@ -300,22 +307,18 @@ }; extraPlugins = (with pkgs.vimPlugins; [ - rainbow-delimiters-nvim telescope-symbols-nvim - overseer-nvim - nvim-web-devicons telescope-zf-native-nvim vim-ReplaceWithRegister vim-dispatch-neovim vim-expand-region - nvim-ufo + colorful-menu-nvim ]) ++ (with pkgs.awesomeNeovimPlugins; [ linrongbin16-gitlinker-nvim officer-nvim - lsp-signature-nvim nvim-biscuits - telescope-egrepify-nvim + colorful-menu-nvim ]); keymaps = [ {