diff --git a/flake.lock b/flake.lock index b06b3bc..7c4022c 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { @@ -48,82 +48,11 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nvim-treesitter": { - "flake": false, - "locked": { - "lastModified": 1767460514, - "narHash": "sha256-LX0rKTZ56Rp0uQfIXZ2JrcWxuCA/t8NJjK05aKiT0Yw=", - "owner": "nvim-treesitter", - "repo": "nvim-treesitter", - "rev": "300b906a9514d5e0ce02911d371445382fe35a31", - "type": "github" - }, - "original": { - "owner": "nvim-treesitter", - "ref": "main", - "repo": "nvim-treesitter", - "type": "github" - } - }, - "nvim-treesitter-main": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "nvim-treesitter": "nvim-treesitter", - "nvim-treesitter-textobjects": "nvim-treesitter-textobjects" - }, - "locked": { - "lastModified": 1767660784, - "narHash": "sha256-ej7y4nhiJNFE/HcZSPTEIrU6/WQmkMJo+bVQfgT3abE=", - "owner": "iofq", - "repo": "nvim-treesitter-main", - "rev": "d82b04e1a05f88ed88c6221672ca0636dc8d6ef7", - "type": "github" - }, - "original": { - "owner": "iofq", - "repo": "nvim-treesitter-main", - "type": "github" - } - }, - "nvim-treesitter-textobjects": { - "flake": false, - "locked": { - "lastModified": 1767434017, - "narHash": "sha256-5VeIAW09my+4fqXbzVG7RnLXrjpXAk/g2vd7RbhNws8=", - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-textobjects", - "rev": "28a3494c075ef0f353314f627546537e43c09592", - "type": "github" - }, - "original": { - "owner": "nvim-treesitter", - "ref": "main", - "repo": "nvim-treesitter-textobjects", - "type": "github" - } - }, "root": { "inputs": { "godotdev": "godotdev", "mdfmt": "mdfmt", - "nixpkgs": "nixpkgs", - "nvim-treesitter-main": "nvim-treesitter-main" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 28d0001..1874bbf 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nvim-treesitter-main.url = "github:iofq/nvim-treesitter-main"; - mdfmt = { url = "github:moorereason/mdfmt"; flake = false; @@ -30,18 +28,7 @@ forAllSystems = f: nixpkgs.lib.genAttrs systems ( system: let - overlays = [ - inputs.nvim-treesitter-main.overlays.default - (final: prev: { - vimPlugins = prev.vimPlugins.extend (f: p: { - nvim-treesitter = p.nvim-treesitter.withAllGrammars; - nvim-treesitter-textobjects = p.nvim-treesitter-textobjects.overrideAttrs { - dependencies = [f.nvim-treesitter]; - }; - }); - }) - ]; - pkgs = import nixpkgs {inherit system overlays;}; + pkgs = import nixpkgs {inherit system;}; in f { inherit pkgs;