diff --git a/flake.lock b/flake.lock index 76a3fc3..3d624db 100644 --- a/flake.lock +++ b/flake.lock @@ -17,18 +17,52 @@ "url": "https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys" } }, - "nixpkgs": { + "nixlib": { "locked": { - "lastModified": 1761173472, - "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-25.05", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1751903740, + "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "032decf9db65efed428afd2fa39d80f7089085eb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1736657626, + "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -49,10 +83,27 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "authorizedKeysRepo": "authorizedKeysRepo", - "nixpkgs": "nixpkgs", + "nixos-generators": "nixos-generators", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index be9e8fb..3901c78 100644 --- a/flake.nix +++ b/flake.nix @@ -8,12 +8,12 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - # # Add nixos-generators as an input. - # # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake - # nixos-generators = { - # url = "github:nix-community/nixos-generators"; - # #inputs.nixpkgs.follows = "nixpkgs"; - # }; + # Add nixos-generators as an input. + # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake + nixos-generators = { + url = "github:nix-community/nixos-generators"; + #inputs.nixpkgs.follows = "nixpkgs"; + }; # Add sops-nix as an input for secret management. # See here: https://github.com/Mic92/sops-nix?tab=readme-ov-file#flakes-current-recommendation @@ -28,7 +28,7 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }: + outputs = { self, nixpkgs, nixos-generators, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }: let specialArgs = { inherit authorizedKeysRepo; @@ -233,30 +233,30 @@ }; }; - # packages.x86_64-linux = { - # proxmox-nixos-template = nixos-generators.nixosGenerate { - # inherit specialArgs; - # system = "x86_64-linux"; - # modules = [ - # ./config/nixos-generators/proxmox.nix - # self.nixosModules.common - # self.nixosModules.proxmox-vm - # ]; - # format = "proxmox"; - # }; + packages.x86_64-linux = { + proxmox-nixos-template = nixos-generators.nixosGenerate { + inherit specialArgs; + system = "x86_64-linux"; + modules = [ + ./config/nixos-generators/proxmox.nix + self.nixosModules.common + self.nixosModules.proxmox-vm + ]; + format = "proxmox"; + }; - # proxmox-chaosknoten-nixos-template = nixos-generators.nixosGenerate { - # inherit specialArgs; - # system = "x86_64-linux"; - # modules = [ - # ./config/nixos-generators/proxmox-chaosknoten.nix - # ./config/proxmox-chaosknoten-additional-initial-config.nix - # self.nixosModules.common - # self.nixosModules.proxmox-vm - # ]; - # format = "proxmox"; - # }; - # }; + proxmox-chaosknoten-nixos-template = nixos-generators.nixosGenerate { + inherit specialArgs; + system = "x86_64-linux"; + modules = [ + ./config/nixos-generators/proxmox-chaosknoten.nix + ./config/proxmox-chaosknoten-additional-initial-config.nix + self.nixosModules.common + self.nixosModules.proxmox-vm + ]; + format = "proxmox"; + }; + }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;