diff --git a/flake.lock b/flake.lock index eb57150..a3c73f7 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -187,24 +187,6 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, - "locked": { - "lastModified": 1674771137, - "narHash": "sha256-Zpk1GbEsYrqKmuIZkx+f+8pU0qcCYJoSUwNz1Zk+R00=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "7c7a8bce3dffe71203dcd4276504d1cb49dfe05f", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, "locked": { "lastModified": 1696343447, "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", @@ -597,7 +579,9 @@ }, "neovim-nix": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "flake-parts" + ], "lazy-nvim": "lazy-nvim", "nixpkgs": [ "nixpkgs" @@ -605,11 +589,11 @@ "pre-commit-nix": "pre-commit-nix" }, "locked": { - "lastModified": 1706936572, - "narHash": "sha256-pEBWnoZX4F7+rzzm3fpLENFmgj5Nl2vW60EVJwwSk/c=", + "lastModified": 1710213054, + "narHash": "sha256-ZwA6pVXv/1a/cz28zRi4+qYVMv5YS0JDeJM7tbtvcJA=", "owner": "willruggiano", "repo": "neovim.nix", - "rev": "3384f3cabecfe536ce5cd68eb3872141c9dd9450", + "rev": "286fcc88160eea5b97a1573562b7a9590885a90a", "type": "github" }, "original": { @@ -700,11 +684,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1672350804, - "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -716,24 +700,6 @@ } }, "nixpkgs-lib_2": { - "locked": { - "dir": "lib", - "lastModified": 1672350804, - "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_3": { "locked": { "dir": "lib", "lastModified": 1696019113, @@ -928,11 +894,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1710159071, + "narHash": "sha256-CT0WKgcmlcWZPZL/sSSICN/Vbm4Of0ZDgxc0GFf6sYU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "0fbcc4b2e8571f4af39be41752581ea09dd9ab06", "type": "github" }, "original": { @@ -1200,7 +1166,7 @@ }, "sg-nvim": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nci": "nci", "nixpkgs": "nixpkgs_8", "pre-commit-nix": "pre-commit-nix_2", diff --git a/flake.nix b/flake.nix index 0130710..bba9938 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,11 @@ devenv.url = "github:cachix/devenv"; flake-parts.url = "github:hercules-ci/flake-parts"; mk-shell-bin.url = "github:rrbutani/nix-mk-shell-bin"; - neovim-nix.url = "github:willruggiano/neovim.nix"; - neovim-nix.inputs.nixpkgs.follows = "nixpkgs"; + neovim-nix = { + url = "github:willruggiano/neovim.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; + }; neovim.url = "github:neovim/neovim/nightly?dir=contrib"; nil.url = "github:oxalica/nil"; # FIXME: see https://github.com/cachix/devenv/issues/528 @@ -76,13 +79,10 @@ formatter = pkgs.alejandra; - packages = let - tree-sitter = pkgs.callPackage ./pkgs/tree-sitter.nix {}; - in { - inherit tree-sitter; + packages = { default = config.neovim.final; nvim-dbee = pkgs.callPackage ./pkgs/nvim-dbee.nix {}; - nvim-treesitter = pkgs.callPackage ./pkgs/nvim-treesitter {inherit tree-sitter;}; + nvim-treesitter = pkgs.callPackage ./pkgs/nvim-treesitter {}; }; }; };