albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

test

Browse source
This commit is contained in:
iFargle 2023-09-19 09:30:44 +09:00
parent d2c450943d
commit b845b9f70f
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/default.nix
View file

@ -21,7 +21,6 @@
hostname, hostname,
username ? "albert", username ? "albert",
desktop ? null, desktop ? null,
installer ? null,
gpu ? null, gpu ? null,
platform ? "x86_64-linux", platform ? "x86_64-linux",
theme ? "default" theme ? "default"
@ -31,7 +30,7 @@
../nixos ../nixos
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
] ++ (inputs.nixpkgs.lib.optionals (installer != null) [ installer ]); ];
}; };
# Combines mkHost and mkHome for image building # Combines mkHost and mkHome for image building
@ -47,6 +46,7 @@
specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu platform theme; }; specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu platform theme; };
modules = [ modules = [
../nixos ../nixos
installer
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
inputs.home-manager.nixosModules.home-manager { inputs.home-manager.nixosModules.home-manager {
@ -57,7 +57,7 @@
inputs.doom-emacs.hmModule inputs.doom-emacs.hmModule
]; ];
} }
] ++ (inputs.nixpkgs.lib.optionals (installer != null) [ installer ]); ];
}; };
forAllSystems = inputs.nixpkgs.lib.genAttrs [ forAllSystems = inputs.nixpkgs.lib.genAttrs [

2
nixos/hosts/nixos-rpi4-img/default.nix
View file

@ -2,7 +2,7 @@
# Build this image with: # Build this image with:
# nix build .#nixosConfigurations.nixos-rpi4-img.config.system.build.sdImage # nix build .#nixosConfigurations.nixos-rpi4-img.config.system.build.sdImage
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
nixpkgs.buildPlatform.system = "${platform}"; nixpkgs.buildPlatform.system = "x86_64-linux";
networking.hostName = "nixos-rpi4-img"; networking.hostName = "nixos-rpi4-img";
networking.firewall.allowedTCPPorts = [ 22 ]; networking.firewall.allowedTCPPorts = [ 22 ];
} }