asonix/sd-images
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Combine baseModule and userModule into customized

Browse source
This commit is contained in:
asonix 2023-02-19 12:20:55 -06:00
parent 16595f9cdd
commit c29904b4b2
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
flake.nix
View file

@ -15,7 +15,7 @@
asonix-key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3+mNUlokSKZQNXJAuGm2LCHelKuElWLJArzIYZQYEPbrFaE+J8VtfNbMMD1qVI21ksfcqvFQW4aiP4+BFDxTOGW0uBmUHWKxkyyU39y2yhnsa+svwwIooc+Iwkxw0atzSMEBb94UaZlq9cKMSnG9RGeRFqfYnW2s49wpU79wk6zEFUuOHCMKn4R7zqkPac7IyjxZeKlspY3fOasNH4zyrkbhEOlvrwEOdRNTRNCWWzDcinIVZjfmErHlSynshx9yLnCGkLBxHSxgI2TVyR3RlQ3aGbHtB3QN5X7/T/dwXJFJ11P1Q2bC3XP3hHCogDqXcPvDTFSQEM/mZuFcKNbsn asonix@asonix-tower";
trusted-public-keys = "firestar:spmMw07mO3cxflq5g2GazhE7ddgEoz6QLwaiCnyz/fg=";
userModule = {
customized = ({ lib, ... }: {
users.users.asonix = {
isNormalUser = true;
description = "Tavi";
@ -23,9 +23,7 @@
openssh.authorizedKeys.keys = [ asonix-key ];
initialPassword = "changeme";
};
};
baseModule = ({ lib, ... }: {
# Nix config
nix.extraOptions = ''
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ${trusted-public-keys}
@ -40,15 +38,14 @@
buildConfig = {
kernel = nixos-aarch64-images.packages.x86_64-linux.kernels.testing-rockchip;
modules = [
baseModule
userModule
customized
];
};
in
with nixos-aarch64-images.packages.x86_64-linux;
{
packages.x86_64-linux = {
modules = buildModules buildConfig;
modules = (buildModules buildConfig) // { inherit customized; };
quartz64a = buildQuartz64A buildConfig;
quartz64b = buildQuartz64B buildConfig;