diff --git a/flake.lock b/flake.lock index f2fcd60..1ad5093 100644 --- a/flake.lock +++ b/flake.lock @@ -35,21 +35,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -101,39 +86,18 @@ "type": "github" } }, - "neovim": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "dir": "contrib", - "lastModified": 1664910906, - "narHash": "sha256-3m0SawPJcCnKGO6cWbX+iha3+0jhSgd45wJfHqAdy1o=", - "owner": "neovim", - "repo": "neovim", - "rev": "6abb48105135ce3ae7eda22334f8104c5ddf20ce", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1662019588, - "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", + "lastModified": 1706683685, + "narHash": "sha256-FtPPshEpxH/ewBOsdKBNhlsL2MLEFv1hEnQ19f/bFsQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2da64a81275b68fdad38af669afeda43d401e94b", + "rev": "5ad9903c16126a7d949101687af0aa589b1d7d3d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -173,22 +137,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1664847737, - "narHash": "sha256-Wxl0CtRH3Vo8+qEZ/PbCcx+9D8wEEi56tJPmROum2ss=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "de80d1d04ee691279e1302a1128c082bbda3ab01", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -207,9 +155,9 @@ "pre-commit-nix": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -230,8 +178,7 @@ "inputs": { "flake-parts": "flake-parts", "lazy-nvim": "lazy-nvim", - "neovim": "neovim", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-nix": "pre-commit-nix" } } diff --git a/flake.nix b/flake.nix index 8f45c9b..b905066 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,6 @@ flake-parts.url = "github:hercules-ci/flake-parts"; lazy-nvim.url = "github:folke/lazy.nvim"; lazy-nvim.flake = false; - neovim.url = "github:neovim/neovim?dir=contrib"; pre-commit-nix.url = "github:cachix/pre-commit-hooks.nix"; # FIXME: This would be nice, and also a test of sorts @@ -42,21 +41,10 @@ perSystem = { config, inputs', + pkgs, system, ... - }: let - pkgs = import inputs.nixpkgs { - inherit system; - overlays = [ - (final: prev: { - neovim = inputs'.neovim.packages.default; - neovim-unwrapped = inputs'.neovim.packages.default; - }) - ]; - }; - in { - _module.args.pkgs = pkgs; - + }: { devShells.default = pkgs.mkShell { name = "neovim.nix"; shellHook = ''