diff --git a/flake.lock b/flake.lock index 71ebe6f..f949da4 100644 --- a/flake.lock +++ b/flake.lock @@ -265,42 +265,6 @@ "type": "github" } }, - "nixlib": { - "locked": { - "lastModified": 1725152544, - "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos-generators": { - "inputs": { - "nixlib": "nixlib", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725497951, - "narHash": "sha256-fayKyVs/9FQdYH+3SCOkQM1GCsEPPVE+lSiVGlYQ7i0=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "15a07ebf4a041bf232026263f1f96f2af390f3bc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1725432240, @@ -374,7 +338,6 @@ "nextcloud-twofactor-totp": "nextcloud-twofactor-totp", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", - "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index 4e402a4..8871401 100644 --- a/flake.nix +++ b/flake.nix @@ -6,11 +6,6 @@ flake-parts.url = "github:hercules-ci/flake-parts"; - nixos-generators = { - url = "github:nix-community/nixos-generators"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/installer/default.nix b/hosts/installer/default.nix index 3d0f01d..01bdafa 100644 --- a/hosts/installer/default.nix +++ b/hosts/installer/default.nix @@ -7,7 +7,6 @@ }: { imports = [ - inputs.nixos-generators.nixosModules.all-formats "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ../common.nix ]; diff --git a/justfile b/justfile index 46d93dc..78371aa 100644 --- a/justfile +++ b/justfile @@ -30,4 +30,4 @@ dev shell='default': nix develop .#{{ shell }} --command zsh build-iso: - nix build .#nixosConfigurations.installer.config.formats.iso -o result + nix run nixpkgs#nixos-generators -- --format iso --flake .#installer -o result