From b64a43328ab0d863c8602c0705cde4d308b10061 Mon Sep 17 00:00:00 2001 From: iFargle Date: Thu, 14 Dec 2023 21:03:33 +0900 Subject: [PATCH] test --- flake.nix | 2 +- lib/default.nix | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/flake.nix b/flake.nix index 274a665f..c447f372 100644 --- a/flake.nix +++ b/flake.nix @@ -79,7 +79,7 @@ }; imageConfigurations = { nixos-linode-img = libx.mkMinImage { hostname = "nixos-linode-img"; format = "linode"; }; - nixos-rpi4-img = libx.mkRpiImage { hostname = "nixos-rpi4-img"; }; + nixos-rpi4-img = libx.mkMinImage { hostname = "nixos-rpi4-img"; format = "sd-aarch64"; platform = "aarch64-linux"; }; nixos-iso-console = libx.mkImage { hostname = "nixos-iso-console"; format = "iso"; }; nixos-iso-desktop = libx.mkImage { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "gnome"; }; }; diff --git a/lib/default.nix b/lib/default.nix index d3c3b01c..a7c329e6 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -77,29 +77,6 @@ ]; }; - # Raspberry Pi SD Card image creator - mkRpiImage = { - hostname , - username ? "albert", - desktop ? null, - platform ? "aarch64-linux", - gpu ? null, - theme ? "default" - }: inputs.nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu platform theme; }; - system = platform; - - modules = [ - "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix" - ../nixos - inputs.sops-nix.nixosModules.sops - inputs.home-manager.nixosModules.home-manager { - home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu platform theme; }; - home-manager.users."${username}" = import ../home-manager; - } - ]; - }; - # Small version mkMinImage = { hostname ,