From 7c24c7cbefd28e6faf17bcadc5b3005b1ab09d32 Mon Sep 17 00:00:00 2001 From: "Dr.Teagle" <65212972+DockterTeagle@users.noreply.github.com> Date: Mon, 5 May 2025 00:38:19 -0500 Subject: [PATCH 1/5] feat: begin using flake-parts feautures more and also compress lockfile --- .gitignore | 1 + flake.lock | 370 +++++++---------------------------------------------- flake.nix | 61 ++++++--- 3 files changed, 89 insertions(+), 343 deletions(-) diff --git a/.gitignore b/.gitignore index 1b988b9f..d69693a6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ result-* .direnv .luarc.json .repro +.pre-commit-config.yaml diff --git a/flake.lock b/flake.lock index 0b95cc77..8f607af6 100644 --- a/flake.lock +++ b/flake.lock @@ -17,22 +17,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -48,7 +32,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -64,30 +48,14 @@ "type": "github" } }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { + "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -96,7 +64,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -131,42 +99,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "neorocks", @@ -188,7 +120,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "neorocks", @@ -210,30 +142,16 @@ "type": "indirect" } }, - "flake-parts_6": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" - }, - "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "gen-luarc": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "flake-parts" + ], "git-hooks": "git-hooks", "luvit-meta": "luvit-meta", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1724097937, @@ -275,9 +193,11 @@ }, "git-hooks_2": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1742649964, @@ -317,31 +237,6 @@ "type": "github" } }, - "git-hooks_4": { - "inputs": { - "flake-compat": "flake-compat_7", - "gitignore": "gitignore_5", - "nixpkgs": [ - "vimcats", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1725438226, - "narHash": "sha256-lL4hQ+g2qiZ02WfidLkrujaT23c6E2Wm7S0ZQhSB8Jk=", - "owner": "mrcjkb", - "repo": "git-hooks.nix", - "rev": "ec0f4d97f48a1f32bd87804e2390f03999790ec0", - "type": "github" - }, - "original": { - "owner": "mrcjkb", - "ref": "clippy", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -367,7 +262,6 @@ "gitignore_2": { "inputs": { "nixpkgs": [ - "neorocks", "git-hooks", "nixpkgs" ] @@ -409,52 +303,9 @@ "type": "github" } }, - "gitignore_4": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_5": { - "inputs": { - "nixpkgs": [ - "vimcats", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_3", "nixpkgs": [ "neorocks", "neovim-nightly", @@ -493,11 +344,15 @@ }, "neorocks": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks_2", + "flake-compat": "flake-compat_3", + "flake-parts": [ + "flake-parts" + ], + "git-hooks": [ + "git-hooks" + ], "neovim-nightly": "neovim-nightly", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1746250227, @@ -516,11 +371,11 @@ "neovim-nightly": { "inputs": { "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks_3", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -555,16 +410,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", - "owner": "nixos", + "lastModified": 1746061036, + "narHash": "sha256-OxYwCGJf9VJ2KnUO+w/hVJVTjOgscdDg/lPv8Eus07Y=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", + "rev": "3afd19146cac33ed242fc0fc87481c67c758a59e", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -584,45 +439,6 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - } - }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_4": { - "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1720386169, @@ -639,55 +455,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1746061036, - "narHash": "sha256-OxYwCGJf9VJ2KnUO+w/hVJVTjOgscdDg/lPv8Eus07Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3afd19146cac33ed242fc0fc87481c67c758a59e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1746152631, "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", @@ -703,7 +471,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1746269363, "narHash": "sha256-Q0lKWway9OmZnkDTpAoAE9VLXHOHqCqdJ3N0tkSM99g=", @@ -719,65 +487,13 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1725910328, - "narHash": "sha256-n9pCtzGZ0httmTwMuEbi5E78UQ4ZbQMr1pzi5N0LAG8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5775c2583f1801df7b790bf7f7d710a19bac66f4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_6", - "gitignore": "gitignore_4", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", "gen-luarc": "gen-luarc", + "git-hooks": "git-hooks_2", "neorocks": "neorocks", - "nixpkgs": "nixpkgs_5", - "pre-commit-hooks": "pre-commit-hooks", + "nixpkgs": "nixpkgs_3", "vimcats": "vimcats" } }, @@ -805,9 +521,15 @@ }, "vimcats": { "inputs": { - "flake-parts": "flake-parts_6", - "git-hooks": "git-hooks_4", - "nixpkgs": "nixpkgs_7" + "flake-parts": [ + "flake-parts" + ], + "git-hooks": [ + "git-hooks" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1726045206, diff --git a/flake.nix b/flake.nix index eac315ae..a1651f68 100755 --- a/flake.nix +++ b/flake.nix @@ -6,20 +6,36 @@ flake-parts.url = "github:hercules-ci/flake-parts"; - pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; + git-hooks = { + url = "github:cachix/git-hooks.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - neorocks.url = "github:nvim-neorocks/neorocks"; + neorocks = { + url = "github:nvim-neorocks/neorocks"; + inputs.flake-parts.follows = "flake-parts"; + inputs.git-hooks.follows = "git-hooks"; + }; - gen-luarc.url = "github:mrcjkb/nix-gen-luarc-json"; + gen-luarc = { + url = "github:mrcjkb/nix-gen-luarc-json"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; + }; - vimcats.url = "github:mrcjkb/vimcats"; + vimcats = { + url = "github:mrcjkb/vimcats"; + inputs.flake-parts.follows = "flake-parts"; + inputs.git-hooks.follows = "git-hooks"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs @ { self, nixpkgs, flake-parts, - pre-commit-hooks, + git-hooks, neorocks, gen-luarc, vimcats, @@ -37,11 +53,15 @@ "x86_64-darwin" "aarch64-darwin" ]; + imports = [ + flake-parts.flakeModules.easyOverlay + ]; perSystem = { config, self', inputs', system, + pkgs, ... }: let ci-overlay = import ./nix/ci-overlay.nix { @@ -49,16 +69,6 @@ plugin-name = name; }; - pkgs = import nixpkgs { - inherit system; - overlays = [ - ci-overlay - neorocks.overlays.default - gen-luarc.overlays.default - plugin-overlay - ]; - }; - luarc-plugins = with pkgs.lua51Packages; [ nvim-nio @@ -84,7 +94,7 @@ ]; }; - type-check-nightly = pre-commit-hooks.lib.${system}.run { + type-check-nightly = git-hooks.lib.${system}.run { src = self; hooks = { lua-ls = { @@ -94,7 +104,7 @@ }; }; - type-check-stable = pre-commit-hooks.lib.${system}.run { + type-check-stable = git-hooks.lib.${system}.run { src = self; hooks = { lua-ls = { @@ -106,7 +116,7 @@ }; }; - pre-commit-check = pre-commit-hooks.lib.${system}.run { + pre-commit-check = git-hooks.lib.${system}.run { src = self; hooks = { alejandra.enable = true; @@ -137,8 +147,9 @@ ${pre-commit-check.shellHook} ln -fs ${pkgs.luarc-to-json luarc-nightly} .luarc.json ''; - buildInputs = with pre-commit-hooks.packages.${system}; + buildInputs = with git-hooks.packages.${system}; [ + pkgs.nixd alejandra lua-language-server stylua @@ -153,6 +164,18 @@ docgen = pkgs.callPackage ./nix/docgen.nix {inherit vimcats;}; in { + _module.args.pkgs = import nixpkgs { + inherit system; + overlays = [ + ci-overlay + neorocks.overlays.default + gen-luarc.overlays.default + plugin-overlay + ]; + }; + # overlayAttrs = { + # + # } devShells = { default = devShell; inherit devShell; From 0bd99e5327294e2195e0774289b6eb3b68eea509 Mon Sep 17 00:00:00 2001 From: "Dr.Teagle" <65212972+DockterTeagle@users.noreply.github.com> Date: Mon, 5 May 2025 06:10:52 -0500 Subject: [PATCH 2/5] chore(build): compress inputs and add flake-module --- flake.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index a1651f68..f739ae9e 100755 --- a/flake.nix +++ b/flake.nix @@ -25,9 +25,11 @@ vimcats = { url = "github:mrcjkb/vimcats"; - inputs.flake-parts.follows = "flake-parts"; - inputs.git-hooks.follows = "git-hooks"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + flake-parts.follows = "flake-parts"; + git-hooks.follows = "git-hooks"; + nixpkgs.follows = "nixpkgs"; + }; }; }; @@ -54,6 +56,7 @@ "aarch64-darwin" ]; imports = [ + git-hooks.flakeModule flake-parts.flakeModules.easyOverlay ]; perSystem = { From 3ec230903f9d0c4f0e5959df0c0ccc79d66223b5 Mon Sep 17 00:00:00 2001 From: "Dr.Teagle" <65212972+DockterTeagle@users.noreply.github.com> Date: Mon, 5 May 2025 11:29:43 -0500 Subject: [PATCH 3/5] chore(build): crunch inputs and ignore warnings --- flake.lock | 122 +++--------------- flake.nix | 23 ++-- .../commands/code_action_group.lua | 1 + lua/rustaceanvim/neotest/init.lua | 2 + spec/fixtures/dap/dynamic-libs/flake.lock | 41 +++--- 5 files changed, 50 insertions(+), 139 deletions(-) diff --git a/flake.lock b/flake.lock index 8f607af6..928f925f 100644 --- a/flake.lock +++ b/flake.lock @@ -17,22 +17,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -48,7 +32,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -64,7 +48,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -147,7 +131,9 @@ "flake-parts": [ "flake-parts" ], - "git-hooks": "git-hooks", + "git-hooks": [ + "git-hooks" + ], "luvit-meta": "luvit-meta", "nixpkgs": [ "nixpkgs" @@ -171,30 +157,6 @@ "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": [ - "gen-luarc", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1723803910, - "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore_2", "nixpkgs": [ "nixpkgs" ] @@ -213,10 +175,10 @@ "type": "github" } }, - "git-hooks_3": { + "git-hooks_2": { "inputs": { - "flake-compat": "flake-compat_5", - "gitignore": "gitignore_3", + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_2", "nixpkgs": [ "neorocks", "neovim-nightly", @@ -240,7 +202,6 @@ "gitignore": { "inputs": { "nixpkgs": [ - "gen-luarc", "git-hooks", "nixpkgs" ] @@ -260,27 +221,6 @@ } }, "gitignore_2": { - "inputs": { - "nixpkgs": [ - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_3": { "inputs": { "nixpkgs": [ "neorocks", @@ -344,7 +284,7 @@ }, "neorocks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": [ "flake-parts" ], @@ -352,7 +292,9 @@ "git-hooks" ], "neovim-nightly": "neovim-nightly", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1746250227, @@ -370,9 +312,9 @@ }, "neovim-nightly": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks_3", + "git-hooks": "git-hooks_2", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", "nixpkgs": "nixpkgs", @@ -439,39 +381,7 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1746152631, - "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1746269363, "narHash": "sha256-Q0lKWway9OmZnkDTpAoAE9VLXHOHqCqdJ3N0tkSM99g=", @@ -491,9 +401,9 @@ "inputs": { "flake-parts": "flake-parts", "gen-luarc": "gen-luarc", - "git-hooks": "git-hooks_2", + "git-hooks": "git-hooks", "neorocks": "neorocks", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "vimcats": "vimcats" } }, diff --git a/flake.nix b/flake.nix index f739ae9e..68f2bec3 100755 --- a/flake.nix +++ b/flake.nix @@ -13,14 +13,20 @@ neorocks = { url = "github:nvim-neorocks/neorocks"; - inputs.flake-parts.follows = "flake-parts"; - inputs.git-hooks.follows = "git-hooks"; + inputs = { + flake-parts.follows = "flake-parts"; + git-hooks.follows = "git-hooks"; + nixpkgs.follows = "nixpkgs"; + }; }; gen-luarc = { url = "github:mrcjkb/nix-gen-luarc-json"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; + git-hooks.follows = "git-hooks"; + }; }; vimcats = { @@ -57,12 +63,9 @@ ]; imports = [ git-hooks.flakeModule - flake-parts.flakeModules.easyOverlay ]; perSystem = { config, - self', - inputs', system, pkgs, ... @@ -122,6 +125,7 @@ pre-commit-check = git-hooks.lib.${system}.run { src = self; hooks = { + statix.enable = true; alejandra.enable = true; stylua.enable = true; luacheck.enable = true; @@ -147,7 +151,7 @@ devShell = pkgs.nvim-nightly-tests.overrideAttrs (oa: { name = "rustaceanvim devShell"; shellHook = '' - ${pre-commit-check.shellHook} + ${config.pre-commit.installationScript} ln -fs ${pkgs.luarc-to-json luarc-nightly} .luarc.json ''; buildInputs = with git-hooks.packages.${system}; @@ -176,9 +180,6 @@ plugin-overlay ]; }; - # overlayAttrs = { - # - # } devShells = { default = devShell; inherit devShell; diff --git a/lua/rustaceanvim/commands/code_action_group.lua b/lua/rustaceanvim/commands/code_action_group.lua index 9f55c256..a2106bfe 100644 --- a/lua/rustaceanvim/commands/code_action_group.lua +++ b/lua/rustaceanvim/commands/code_action_group.lua @@ -287,6 +287,7 @@ function M.cleanup() M.state.secondary.clear() end + ---@diagnostic disable-next-line M.state.actions = {} M.state.active_group_index = nil M.state.ctx = {} diff --git a/lua/rustaceanvim/neotest/init.lua b/lua/rustaceanvim/neotest/init.lua index 442b2f7c..984a7f27 100644 --- a/lua/rustaceanvim/neotest/init.lua +++ b/lua/rustaceanvim/neotest/init.lua @@ -36,6 +36,7 @@ local trans = require('rustaceanvim.neotest.trans') ---@package ---@type neotest.Adapter +---@diagnostic disable-next-line local NeotestAdapter = { name = 'rustaceanvim' } ---@package @@ -286,6 +287,7 @@ function NeotestAdapter.build_spec(run_args) end ---@cast strategy rustaceanvim.dap.client.Config ---@type rustaceanvim.neotest.RunSpec + ---@diagnostic disable-next-line local run_spec = { cwd = cwd, context = context, diff --git a/spec/fixtures/dap/dynamic-libs/flake.lock b/spec/fixtures/dap/dynamic-libs/flake.lock index 6fdfe3ef..e2a7acaa 100644 --- a/spec/fixtures/dap/dynamic-libs/flake.lock +++ b/spec/fixtures/dap/dynamic-libs/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1701199688, - "narHash": "sha256-IPoglO4G7dt+1VDw0fMcLhlIeZBPGHfO77sASI657YM=", + "lastModified": 1746427067, + "narHash": "sha256-MlBKT0A2nK8LHDkeg3jrG2wo80C1bSGyT2tmKrc6pM0=", "owner": "nix-community", "repo": "fenix", - "rev": "5e69426d44e2a45b8e2f6e5b1f42e7ad34ac86c8", + "rev": "9e7d648c1f8fdf7beb9b0b1abb3a41d0d8b5fb05", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -41,11 +41,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701040486, - "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=", + "lastModified": 1746332716, + "narHash": "sha256-VBmKSkmw9PYBCEGhBKzORjx+nwNZkPZyHcUHE21A/ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45827faa2132b8eade424f6bdd48d8828754341a", + "rev": "6b1c028bce9c89e9824cde040d6986d428296055", "type": "github" }, "original": { @@ -57,19 +57,16 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "type": "github" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, @@ -83,11 +80,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1701102379, - "narHash": "sha256-UC6wSGSSdBS/dJME83IYo/7CY7p8gEOBkEuEt6CPVH4=", + "lastModified": 1746332785, + "narHash": "sha256-d4/WBcspAR38AMsZysrQsenF1NmZ0/9GhjD4hxvPygo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2ee17bc5f256e379c4df954e984b9bd0d79f1cbd", + "rev": "3b57c001518aeb42511e177221f98ecf42104016", "type": "github" }, "original": { From 45c5d2920cc6f37bb25515184258d59251e1c6f9 Mon Sep 17 00:00:00 2001 From: "Dr.Teagle" <65212972+DockterTeagle@users.noreply.github.com> Date: Mon, 5 May 2025 11:37:16 -0500 Subject: [PATCH 4/5] chore(build): make statix happy --- flake.nix | 1 + nix/ci-overlay.nix | 3 +-- nix/plugin-overlay.nix | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 68f2bec3..11ce9ef5 100755 --- a/flake.nix +++ b/flake.nix @@ -156,6 +156,7 @@ ''; buildInputs = with git-hooks.packages.${system}; [ + pkgs.statix pkgs.nixd alejandra lua-language-server diff --git a/nix/ci-overlay.nix b/nix/ci-overlay.nix index 76c379a6..77a2ad78 100755 --- a/nix/ci-overlay.nix +++ b/nix/ci-overlay.nix @@ -5,7 +5,7 @@ }: final: prev: let nvim-nightly = final.neovim-nightly; - lib = final.lib; + inherit (final) lib; # For manual debugging purposes mkNvimMinimal = nvim: @@ -47,7 +47,6 @@ mkNeorocksTest = { name, nvim ? final.neovim-unwrapped, - extraPkgs ? [], }: let nvim-wrapped = final.pkgs.wrapNeovim nvim { configure = { diff --git a/nix/plugin-overlay.nix b/nix/plugin-overlay.nix index 97e3b1e1..e5d1d445 100755 --- a/nix/plugin-overlay.nix +++ b/nix/plugin-overlay.nix @@ -6,7 +6,6 @@ rustaceanvim = luaself.callPackage ({ luaOlder, buildLuarocksPackage, - lua, }: buildLuarocksPackage { pname = name; @@ -42,7 +41,7 @@ in { }; }; - rustaceanvim = final.vimPlugins.rustaceanvim; + inherit (final.vimPlugins) rustaceanvim; rustaceanvim-dev = final.vimPlugins.rustaceanvim; codelldb = final.vscode-extensions.vadimcn.vscode-lldb.adapter; From 143fe2e2814160c3dd74a99429258bb465c4d6df Mon Sep 17 00:00:00 2001 From: "Dr.Teagle" <65212972+DockterTeagle@users.noreply.github.com> Date: Mon, 5 May 2025 12:06:21 -0500 Subject: [PATCH 5/5] chore(build): dont completely disable diagnostics --- lua/rustaceanvim/commands/code_action_group.lua | 2 +- lua/rustaceanvim/neotest/init.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/rustaceanvim/commands/code_action_group.lua b/lua/rustaceanvim/commands/code_action_group.lua index a2106bfe..aed61633 100644 --- a/lua/rustaceanvim/commands/code_action_group.lua +++ b/lua/rustaceanvim/commands/code_action_group.lua @@ -287,7 +287,7 @@ function M.cleanup() M.state.secondary.clear() end - ---@diagnostic disable-next-line + ---@diagnostic disable-next-line missing-fields M.state.actions = {} M.state.active_group_index = nil M.state.ctx = {} diff --git a/lua/rustaceanvim/neotest/init.lua b/lua/rustaceanvim/neotest/init.lua index 984a7f27..631bca97 100644 --- a/lua/rustaceanvim/neotest/init.lua +++ b/lua/rustaceanvim/neotest/init.lua @@ -36,7 +36,7 @@ local trans = require('rustaceanvim.neotest.trans') ---@package ---@type neotest.Adapter ----@diagnostic disable-next-line +---@diagnostic disable-next-line missing-fields local NeotestAdapter = { name = 'rustaceanvim' } ---@package