From 9cda644dda0422cb66308f5681aff2c0e30a5c1f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Nov 2025 00:52:57 +0000 Subject: [PATCH 1/2] chore(deps): update determinatesystems/update-flake-lock action to v28 --- .github/workflows/update-flake.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-flake.yaml b/.github/workflows/update-flake.yaml index 1403966..db6a8bc 100644 --- a/.github/workflows/update-flake.yaml +++ b/.github/workflows/update-flake.yaml @@ -44,7 +44,7 @@ jobs: - name: Update flake.lock if: steps.check_updates.outputs.update_available == 'true' - uses: DeterminateSystems/update-flake-lock@v27 + uses: DeterminateSystems/update-flake-lock@v28 with: nix-options: --debug --log-format raw token: ${{ secrets.FLAKE_TOKEN }} From f7c1e18abde29ee96f660566de47ecb34deb0d77 Mon Sep 17 00:00:00 2001 From: Roel de Cort <63876068+dc-tec@users.noreply.github.com> Date: Wed, 15 Apr 2026 17:25:13 +0200 Subject: [PATCH 2/2] chore(nixvim): update NixVim flake and resolve deprecations (#122) ## Summary - update flake inputs and switch formatter usage from `nixfmt-rfc-style` to `nixfmt` - migrate deprecated NixVim plugin options for `treesitter`, `treesitter-textobjects`, `startup`, and `neo-tree` - replace deprecated `vim.lsp.with()` handler wrappers in the local LSP config - apply resulting `nixfmt` formatting cleanup ## Testing - `nix flake check` ## Notes - the remaining warning during evaluation is the upstream Nixpkgs notice that `x86_64-darwin` support ends after Nixpkgs 26.05 --- config/plugins/editor/neo-tree.nix | 64 +++++------ config/plugins/editor/treesitter.nix | 86 ++++++++------- config/plugins/lsp/conform.nix | 6 +- config/plugins/lsp/lsp.nix | 20 ++-- config/plugins/ui/startup.nix | 47 ++++---- config/plugins/utils/extra_plugins.nix | 6 +- flake.lock | 145 +++++-------------------- flake.nix | 4 +- 8 files changed, 147 insertions(+), 231 deletions(-) diff --git a/config/plugins/editor/neo-tree.nix b/config/plugins/editor/neo-tree.nix index f8552c0..684d6e9 100644 --- a/config/plugins/editor/neo-tree.nix +++ b/config/plugins/editor/neo-tree.nix @@ -1,40 +1,42 @@ { plugins.neo-tree = { enable = true; - sources = [ - "filesystem" - "buffers" - "git_status" - "document_symbols" - ]; - addBlankLineAtTop = false; + settings = { + sources = [ + "filesystem" + "buffers" + "git_status" + "document_symbols" + ]; + add_blank_line_at_top = false; - filesystem = { - bindToCwd = false; - followCurrentFile = { - enabled = true; - }; - }; - - defaultComponentConfigs = { - indent = { - withExpanders = true; - expanderCollapsed = "󰅂"; - expanderExpanded = "󰅀"; - expanderHighlight = "NeoTreeExpander"; + filesystem = { + bind_to_cwd = false; + follow_current_file = { + enabled = true; + }; }; - gitStatus = { - symbols = { - added = " "; - conflict = "󰩌 "; - deleted = "󱂥"; - ignored = " "; - modified = " "; - renamed = "󰑕"; - staged = "󰩍"; - unstaged = ""; - untracked = " "; + default_component_configs = { + indent = { + with_expanders = true; + expander_collapsed = "󰅂"; + expander_expanded = "󰅀"; + expander_highlight = "NeoTreeExpander"; + }; + + git_status = { + symbols = { + added = " "; + conflict = "󰩌 "; + deleted = "󱂥"; + ignored = " "; + modified = " "; + renamed = "󰑕"; + staged = "󰩍"; + unstaged = ""; + untracked = " "; + }; }; }; }; diff --git a/config/plugins/editor/treesitter.nix b/config/plugins/editor/treesitter.nix index 4b6648e..e3d79ef 100644 --- a/config/plugins/editor/treesitter.nix +++ b/config/plugins/editor/treesitter.nix @@ -6,56 +6,58 @@ indent.enable = true; highlight.enable = true; }; - folding = false; + folding.enable = false; nixvimInjections = true; grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars; }; plugins.treesitter-textobjects = { enable = false; - select = { - enable = true; - lookahead = true; - keymaps = { - "aa" = "@parameter.outer"; - "ia" = "@parameter.inner"; - "af" = "@function.outer"; - "if" = "@function.inner"; - "ac" = "@class.outer"; - "ic" = "@class.inner"; - "ii" = "@conditional.inner"; - "ai" = "@conditional.outer"; - "il" = "@loop.inner"; - "al" = "@loop.outer"; - "at" = "@comment.outer"; + settings = { + select = { + enable = true; + lookahead = true; + keymaps = { + "aa" = "@parameter.outer"; + "ia" = "@parameter.inner"; + "af" = "@function.outer"; + "if" = "@function.inner"; + "ac" = "@class.outer"; + "ic" = "@class.inner"; + "ii" = "@conditional.inner"; + "ai" = "@conditional.outer"; + "il" = "@loop.inner"; + "al" = "@loop.outer"; + "at" = "@comment.outer"; + }; }; - }; - move = { - enable = true; - gotoNextStart = { - "]m" = "@function.outer"; - "]]" = "@class.outer"; + move = { + enable = true; + goto_next_start = { + "]m" = "@function.outer"; + "]]" = "@class.outer"; + }; + goto_next_end = { + "]M" = "@function.outer"; + "][" = "@class.outer"; + }; + goto_previous_start = { + "[m" = "@function.outer"; + "[[" = "@class.outer"; + }; + goto_previous_end = { + "[M" = "@function.outer"; + "[]" = "@class.outer"; + }; }; - gotoNextEnd = { - "]M" = "@function.outer"; - "][" = "@class.outer"; - }; - gotoPreviousStart = { - "[m" = "@function.outer"; - "[[" = "@class.outer"; - }; - gotoPreviousEnd = { - "[M" = "@function.outer"; - "[]" = "@class.outer"; - }; - }; - swap = { - enable = true; - swapNext = { - "a" = "@parameters.inner"; - }; - swapPrevious = { - "A" = "@parameter.outer"; + swap = { + enable = true; + swap_next = { + "a" = "@parameters.inner"; + }; + swap_previous = { + "A" = "@parameter.outer"; + }; }; }; }; diff --git a/config/plugins/lsp/conform.nix b/config/plugins/lsp/conform.nix index 1e5ecba..c6ab530 100644 --- a/config/plugins/lsp/conform.nix +++ b/config/plugins/lsp/conform.nix @@ -103,7 +103,7 @@ "isort" ]; lua = [ "stylua" ]; - nix = [ "nixfmt-rfc-style" ]; + nix = [ "nixfmt" ]; markdown = { __unkeyed-1 = "prettierd"; __unkeyed-2 = "prettier"; @@ -132,8 +132,8 @@ isort = { command = "${lib.getExe pkgs.isort}"; }; - nixfmt-rfc-style = { - command = "${lib.getExe pkgs.nixfmt-rfc-style}"; + nixfmt = { + command = "${lib.getExe pkgs.nixfmt}"; }; alejandra = { command = "${lib.getExe pkgs.alejandra}"; diff --git a/config/plugins/lsp/lsp.nix b/config/plugins/lsp/lsp.nix index a1d44a3..b65973b 100644 --- a/config/plugins/lsp/lsp.nix +++ b/config/plugins/lsp/lsp.nix @@ -138,17 +138,17 @@ extraConfigLua = '' local _border = "rounded" - vim.lsp.handlers["textDocument/hover"] = vim.lsp.with( - vim.lsp.handlers.hover, { - border = _border - } - ) + vim.lsp.handlers["textDocument/hover"] = function(err, result, ctx, config) + config = config or {} + config.border = _border + return vim.lsp.handlers.hover(err, result, ctx, config) + end - vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with( - vim.lsp.handlers.signature_help, { - border = _border - } - ) + vim.lsp.handlers["textDocument/signatureHelp"] = function(err, result, ctx, config) + config = config or {} + config.border = _border + return vim.lsp.handlers.signature_help(err, result, ctx, config) + end vim.diagnostic.config{ float={border=_border} diff --git a/config/plugins/ui/startup.nix b/config/plugins/ui/startup.nix index a665f22..cd9fb78 100644 --- a/config/plugins/ui/startup.nix +++ b/config/plugins/ui/startup.nix @@ -1,18 +1,17 @@ { plugins.startup = { enable = true; + settings = { + colors = { + background = "#ffffff"; + folded_section = "#ffffff"; + }; - colors = { - background = "#ffffff"; - foldedSection = "#ffffff"; - }; - - sections = { header = { type = "text"; - oldfilesDirectory = false; + oldfiles_directory = false; align = "center"; - foldSection = false; + fold_section = false; title = "Header"; margin = 5; content = [ @@ -24,15 +23,15 @@ " ╚═════╝░╚══════╝░╚════╝░░╚════╝░╚═╝░░╚═╝░░░╚═╝░░░╚═╝░░░╚═╝░░░╚══════╝░╚════╝░╚═╝░░╚═╝" ]; highlight = "Statement"; - defaultColor = ""; - oldfilesAmount = 0; + default_color = ""; + oldfiles_amount = 0; }; body = { type = "mapping"; - oldfilesDirectory = false; + oldfiles_directory = false; align = "center"; - foldSection = false; + fold_section = false; title = "Menu"; margin = 5; content = [ @@ -68,21 +67,21 @@ ] ]; highlight = "string"; - defaultColor = ""; - oldfilesAmount = 0; + default_color = ""; + oldfiles_amount = 0; }; - }; - options = { - paddings = [ - 1 - 3 + options = { + paddings = [ + 1 + 3 + ]; + }; + + parts = [ + "header" + "body" ]; }; - - parts = [ - "header" - "body" - ]; }; } diff --git a/config/plugins/utils/extra_plugins.nix b/config/plugins/utils/extra_plugins.nix index 28fa3ff..f878d83 100644 --- a/config/plugins/utils/extra_plugins.nix +++ b/config/plugins/utils/extra_plugins.nix @@ -1,7 +1,5 @@ { pkgs, ... }: { - extraPlugins = - with pkgs.vimPlugins; - [ - ]; + extraPlugins = with pkgs.vimPlugins; [ + ]; } diff --git a/flake.lock b/flake.lock index e24d7df..36e7695 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -55,24 +55,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -94,41 +76,13 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { @@ -140,11 +94,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -155,11 +109,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759632233, - "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", + "lastModified": 1774701658, + "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", + "rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe", "type": "github" }, "original": { @@ -171,11 +125,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1759070547, - "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "lastModified": 1770073757, + "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "647e5c14cbd5067f44ac86b74f014962df460840", + "rev": "47472570b1e607482890801aeaf29bfb749884f6", "type": "github" }, "original": { @@ -189,15 +143,14 @@ "inputs": { "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_2", - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1759754635, - "narHash": "sha256-RzC36w8c+RR/OYZcYN18+QaNdiwfRhzmuhooYiuEamA=", + "lastModified": 1776128025, + "narHash": "sha256-spZM5zll0cBPHHSZPioZREArzCsllurKQsJME08nnXY=", "owner": "nix-community", "repo": "nixvim", - "rev": "4024aa47f0b55058dc05d10eb98cb6387b23b690", + "rev": "0a12693297d23f1b3af04ba6112b5936e2eba41b", "type": "github" }, "original": { @@ -206,29 +159,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758662783, - "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=", - "owner": "NuschtOS", - "repo": "search", - "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -236,11 +166,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759523803, - "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=", + "lastModified": 1775585728, + "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", + "rev": "580633fa3fe5fc0379905986543fd7495481913d", "type": "github" }, "original": { @@ -271,21 +201,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 84cb5f8..bc550fb 100644 --- a/flake.nix +++ b/flake.nix @@ -56,12 +56,12 @@ src = ./.; hooks = { statix.enable = true; - nixfmt-rfc-style.enable = true; + nixfmt.enable = true; }; }; }; - formatter = pkgs.nixfmt-rfc-style; + formatter = pkgs.nixfmt; packages = { default = nvim;