diff --git a/flake.lock b/flake.lock index 25acd15f..c8a3a6da 100644 --- a/flake.lock +++ b/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "agenix": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1652712410, - "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=", - "owner": "ryantm", - "repo": "agenix", - "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", - "type": "github" - }, - "original": { - "owner": "ryantm", - "ref": "main", - "repo": "agenix", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -40,22 +21,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1606424373, - "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1653893745, @@ -72,21 +37,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1617631617, - "narHash": "sha256-PARRCz55qN3gy07VJZIlFeOX420d0nGF0RzGI/9hVlw=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b2c27d1a81b0dc266270fa8aeecebbd1807fc610", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -108,27 +58,6 @@ "type": "github" } }, - "neuron": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1649334661, - "narHash": "sha256-nwiCwTFtCfUNyR7iWI7Wf8r4Ri6zOmhQdGYVVbjytyA=", - "owner": "srid", - "repo": "neuron", - "rev": "f8b5fb597f85528ae4d7d1ded9e79ac901833665", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "master", - "repo": "neuron", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1654057797, @@ -145,22 +74,6 @@ "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1638587357, - "narHash": "sha256-2ySMW3QARG8BsRPmwe7clTbdCuaObromOKewykP+UJc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e34c5379866833f41e2a36f309912fa675d687c7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-21_11": { "locked": { "lastModified": 1653819578, @@ -225,38 +138,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1630140382, - "narHash": "sha256-ntXepAHFlAEtaYIU5EzckRUODeeMgpu1u2Yug+4LFNc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "08ef0f28e3a41424b92ba1d203de64257a9fca6a", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "08ef0f28e3a41424b92ba1d203de64257a9fca6a", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1653738054, - "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1654248756, @@ -275,11 +156,9 @@ }, "root": { "inputs": { - "agenix": "agenix", "darwin": "darwin", "flake-utils": "flake-utils", "home-manager": "home-manager", - "neuron": "neuron", "nixos-hardware": "nixos-hardware", "nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable", "nixpkgs-stable": "nixpkgs-stable", @@ -289,7 +168,9 @@ }, "sops": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs-stable" + ], "nixpkgs-21_11": "nixpkgs-21_11", "nixpkgs-22_05": "nixpkgs-22_05" }, diff --git a/flake.nix b/flake.nix index c1de62eb..f4260b54 100644 --- a/flake.nix +++ b/flake.nix @@ -1,18 +1,14 @@ { description = "NixOS configuration with flakes"; outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable - , nixpkgs-stable, darwin, nixos-hardware, nur, agenix, neuron, sops, - }@inputs: + , nixpkgs-stable, darwin, nixos-hardware, nur, sops, }@inputs: let mkServer = pkgs: system: hostname: pkgs.lib.nixosSystem { inherit system; - modules = [ - (./. + "/nixos/boxes/${hostname}") - agenix.nixosModules.age - sops.nixosModules.sops - ]; + modules = + [ (./. + "/nixos/boxes/${hostname}") sops.nixosModules.sops ]; specialArgs = { inherit inputs; }; }; mkRaspi = pkgs: hostname: @@ -206,25 +202,12 @@ ref = "master"; }; - agenix = { - type = "github"; - owner = "ryantm"; - repo = "agenix"; - ref = "main"; - }; - - neuron = { - type = "github"; - owner = "srid"; - repo = "neuron"; - ref = "master"; - }; - sops = { type = "github"; owner = "Mic92"; repo = "sops-nix"; ref = "master"; + inputs.nixpkgs.follows = "nixpkgs-stable"; }; };