diff --git a/flake.lock b/flake.lock index 6dd6292..b9c4de9 100644 --- a/flake.lock +++ b/flake.lock @@ -55,39 +55,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -169,39 +136,18 @@ "type": "github" } }, - "nixneovimplugins": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "poetry2nix": "poetry2nix" - }, - "locked": { - "lastModified": 1689863408, - "narHash": "sha256-pYMjCx/ldy/06YP9+g5DivlcNwtBH3Cb4w5zLnKck7Q=", - "owner": "nixneovim", - "repo": "nixneovimplugins", - "rev": "860889db4427d69cac3689e38d1717a08e9c0e77", - "type": "github" - }, - "original": { - "owner": "nixneovim", - "repo": "nixneovimplugins", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1682243003, - "narHash": "sha256-3B162/r0TtiU+/qUN4pWrd6BDRiQyfRJGHVbyVGPTTM=", + "lastModified": 1689679375, + "narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c767200ef42f9b79e184d53454b13e0ab6ddb641", + "rev": "684c17c429c42515bafb3ad775d2a710947f3d67", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -222,41 +168,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1689679375, - "narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "684c17c429c42515bafb3ad775d2a710947f3d67", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1682132397, - "narHash": "sha256-NbIdSrx3Y1NioEEvoaOTETNTpq6m6bfoxmEt/C8GLAQ=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "e2d2c7a31485aeb801fa85da2d0fa103dd5112ef", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -293,8 +204,7 @@ "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", - "nixneovimplugins": "nixneovimplugins", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -311,21 +221,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 53a22c7..dab8821 100644 --- a/flake.nix +++ b/flake.nix @@ -19,11 +19,6 @@ url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; }; - - nixneovimplugins = { - url = "github:nixneovim/nixneovimplugins"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -32,7 +27,6 @@ home-manager, impermanence, lanzaboote, - nixneovimplugins, } @ inputs: let secrets = import ./secrets.nix; in { @@ -45,7 +39,7 @@ config = { allowUnfree = true; }; - overlays = [(import ./packages) nixneovimplugins.overlays.default]; + overlays = [(import ./packages)]; }; specialArgs = inputs // {inherit secrets;}; modules = [