diff --git a/flake.lock b/flake.lock index 2eb4b51..c42f1ee 100644 --- a/flake.lock +++ b/flake.lock @@ -101,11 +101,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { diff --git a/nvf.nix b/nvf.nix index b6aaa34..6cfc4e2 100644 --- a/nvf.nix +++ b/nvf.nix @@ -1,12 +1,14 @@ -{pkgs, ...}: { +{pkgs, ...}: let + inherit (pkgs) vimPlugins; +in { config.vim = { extraPlugins = { mini-statusline = { - package = pkgs.vimPlugins.mini-nvim; + package = vimPlugins.mini-nvim; setup = "require('mini.statusline').setup {}"; }; nightfox = { - package = pkgs.vimPlugins.nightfox-nvim; + package = vimPlugins.nightfox-nvim; setup = "vim.cmd('colorscheme carbonfox')"; }; }; @@ -30,11 +32,21 @@ lspSignature.enable = true; lsplines.enable = true; lspsaga.enable = true; + otter-nvim.enable = true; + nvim-docs-view.enable = true; + trouble.enable = true; + null-ls.enable = true; + }; + debugger.nvim-dap = { + enable = true; + ui.enable = true; }; languages = { enableFormat = true; enableLSP = true; + enableDAP = true; enableTreesitter = true; + enableExtraDiagnostics = true; nix.enable = true; lua.enable = true; ts.enable = true; @@ -45,30 +57,63 @@ nvim-web-devicons.enable = true; fidget-nvim.enable = true; }; - maps = { - normal = { - ":" = { - silent = true; - action = "q:"; - }; - ":" = { - silent = true; - action = ":"; - }; - }; - }; notes = { orgmode.enable = true; todo-comments.enable = true; }; - ui.noice.enable = true; + ui = { + borders = { + enable = true; + globalStyle = "single"; + }; + noice.enable = true; + colorizer.enable = true; + illuminate.enable = true; + breadcrumbs = { + enable = true; + navbuddy.enable = true; + }; + smartcolumn = { + enable = true; + setupOpts.custom_colorcolumn = { + nix = "110"; + ruby = "120"; + java = "130"; + go = ["90" "130"]; + }; + }; + fastaction.enable = true; + }; + keymaps = [ + { + key = ":"; + mode = "n"; + silent = true; + action = "q:"; + } + { + key = "\\"; + mode = "n"; + silent = true; + action = ":"; + } + ]; + treesitter = { + fold = true; + indent.enable = true; + context.enable = true; + highlight.enable = true; + incrementalSelection.enable = true; + }; + dashboard.alpha.enable = true; binds.whichKey.enable = true; - filetree.nvimTree.enable = true; - treesitter.context.enable = true; + filetree.neo-tree.enable = true; notify.nvim-notify.enable = true; comments.comment-nvim.enable = true; autocomplete.nvim-cmp.enable = true; + snippets.luasnip.enable = true; projects.project-nvim.enable = true; + spellcheck.enable = true; telescope.enable = true; treesitter.enable = true; viAlias = true;