diff --git a/devices/hufuf/default.nix b/devices/hufuf/default.nix deleted file mode 100644 index ff518a7..0000000 --- a/devices/hufuf/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{pkgs, ...}: { - imports = [ - ./options.nix - ]; - - nixpkgs.hostPlatform = "x86_64-linux"; - - networking = { - hostName = "hufuf"; - }; - - boot = { - initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod"]; - kernelPackages = pkgs.linuxPackages_latest; - loader = { - systemd-boot = { - enable = true; - }; - }; - }; -} diff --git a/devices/hufuf/options.nix b/devices/hufuf/options.nix deleted file mode 100644 index a1fe792..0000000 --- a/devices/hufuf/options.nix +++ /dev/null @@ -1,8 +0,0 @@ -{...}: { - conf = { - host = "laptop"; - - stateVersion = "24.11"; - hmStateVersion = "24.11"; - }; -} diff --git a/flake.lock b/flake.lock index 002d665..78d6998 100644 --- a/flake.lock +++ b/flake.lock @@ -337,6 +337,42 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742568034, + "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1743167577, @@ -487,6 +523,7 @@ "lanzaboote": "lanzaboote", "niri": "niri", "nix-alien": "nix-alien", + "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nur": "nur" diff --git a/flake.nix b/flake.nix index e4924d5..7d803b0 100644 --- a/flake.nix +++ b/flake.nix @@ -18,11 +18,6 @@ url = "github:nixos/nixos-hardware"; }; - nixos-generators = { - url = "github:nix-community/nixos-generators"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - disko = { url = "github:nix-community/disko/latest"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/outputs.nix b/outputs.nix index aca7bf3..b1255d8 100644 --- a/outputs.nix +++ b/outputs.nix @@ -2,7 +2,6 @@ nixpkgs, home-manager, nixos-hardware, - nixos-generators, disko, niri, lanzaboote, @@ -48,16 +47,4 @@ in { ++ modules; }; }; - packages.x86_64-linux = { - live = nixos-generators.nixosGenerate { - system = "x86_64-linux"; - format = "iso"; - - modules = - [ - ./devices/hufuf - ] - ++ modules; - }; - }; }