diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 93758eb..134657f 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -7,9 +7,9 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Renovate - uses: renovatebot/github-action@v43.0.2 + uses: renovatebot/github-action@v43.0.14 with: configurationFile: renovate.json5 renovate-version: full diff --git a/.github/workflows/update-flake.yaml b/.github/workflows/update-flake.yaml index 188e488..1403966 100644 --- a/.github/workflows/update-flake.yaml +++ b/.github/workflows/update-flake.yaml @@ -19,10 +19,10 @@ jobs: steps: - name: Repository Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v18 + uses: DeterminateSystems/nix-installer-action@v20 - name: Check for Updates id: check_updates @@ -44,7 +44,7 @@ jobs: - name: Update flake.lock if: steps.check_updates.outputs.update_available == 'true' - uses: DeterminateSystems/update-flake-lock@v26 + uses: DeterminateSystems/update-flake-lock@v27 with: nix-options: --debug --log-format raw token: ${{ secrets.FLAKE_TOKEN }} @@ -69,12 +69,12 @@ jobs: steps: - name: Repository Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: update_flake_lock_action - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v18 + uses: DeterminateSystems/nix-installer-action@v20 - name: Build and Test Configuration id: build @@ -100,7 +100,7 @@ jobs: - name: Create Issue on Build Failure if: env.build_status == 'failure' - uses: actions/github-script@v7 + uses: actions/github-script@v8 with: script: | const os = '${{ matrix.os }}'; diff --git a/config/plugins/cmp/lspkind.nix b/config/plugins/cmp/lspkind.nix index 73f2b1c..6f33368 100644 --- a/config/plugins/cmp/lspkind.nix +++ b/config/plugins/cmp/lspkind.nix @@ -1,10 +1,10 @@ { plugins.lspkind = { enable = true; - symbolMap = { - Copilot = " "; - }; - extraOptions = { + settings = { + symbol_map = { + Copilot = " "; + }; maxwidth = 50; ellipsis_char = "..."; }; diff --git a/config/plugins/editor/illuminate.nix b/config/plugins/editor/illuminate.nix index 7bfedb7..3822c01 100644 --- a/config/plugins/editor/illuminate.nix +++ b/config/plugins/editor/illuminate.nix @@ -1,13 +1,15 @@ { plugins.illuminate = { enable = true; - underCursor = false; - filetypesDenylist = [ - "Outline" - "TelescopePrompt" - "alpha" - "harpoon" - "reason" - ]; + settings = { + under_cursor = false; + filetypes_denylist = [ + "Outline" + "TelescopePrompt" + "alpha" + "harpoon" + "reason" + ]; + }; }; } 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 b0bdcc0..b65973b 100644 --- a/config/plugins/lsp/lsp.nix +++ b/config/plugins/lsp/lsp.nix @@ -38,9 +38,6 @@ terraformls = { enable = true; }; - ansiblels = { - enable = true; - }; jsonls = { enable = true; }; @@ -70,8 +67,10 @@ "http://json.schemastore.org/ansible-playbook" = "*play*.{yml,yaml}"; "http://json.schemastore.org/chart" = "Chart.{yml,yaml}"; "https://json.schemastore.org/dependabot-v2" = ".github/dependabot.{yml,yaml}"; - "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" = "*docker-compose*.{yml,yaml}"; - "https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" = "*flow*.{yml,yaml}"; + "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" = + "*docker-compose*.{yml,yaml}"; + "https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" = + "*flow*.{yml,yaml}"; }; }; }; @@ -139,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/config/settings.nix b/config/settings.nix index a8155a8..357331e 100644 --- a/config/settings.nix +++ b/config/settings.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { config = { extraConfigLuaPre = @@ -10,7 +11,7 @@ ''; clipboard = { - providers.wl-copy.enable = true; + providers.wl-copy.enable = pkgs.stdenv.isLinux; }; opts = { diff --git a/flake.lock b/flake.lock index b1596f4..36e7695 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "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": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.8", - "repo": "ixx", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { @@ -140,11 +94,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -155,11 +109,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750811787, - "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=", + "lastModified": 1774701658, + "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1", + "rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe", "type": "github" }, "original": { @@ -171,11 +125,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", + "lastModified": 1770073757, + "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", + "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": 1751144320, - "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=", + "lastModified": 1776128025, + "narHash": "sha256-spZM5zll0cBPHHSZPioZREArzCsllurKQsJME08nnXY=", "owner": "nix-community", "repo": "nixvim", - "rev": "ceb52aece5d571b37096945c2815604195a04eb4", + "rev": "0a12693297d23f1b3af04ba6112b5936e2eba41b", "type": "github" }, "original": { @@ -206,29 +159,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1749730855, - "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", - "owner": "NuschtOS", - "repo": "search", - "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", - "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": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1775585728, + "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "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;