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

Update deps, pull custom config into flake.nix

Browse source
This commit is contained in:
asonix 2023-02-18 22:15:12 -06:00
parent 76145d4267
commit 1bc994a4c6
3 changed files with 18 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
flake.lock
View file

@ -1,41 +1,5 @@
{
"nodes": {
"nixlib": {
"locked": {
"lastModified": 1636849918,
"narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixos-generators": {
"inputs": {
"nixlib": "nixlib",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1676297861,
"narHash": "sha256-YECUmK34xzg0IERpnbCnaO6z6YgfecJlstMWX7dqOZ8=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "1e0a05219f2a557d4622bc38f542abb360518795",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixos-generators",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1676569297,
@ -54,7 +18,6 @@
},
"root": {
"inputs": {
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs"
}
}

49
flake.nix
View file

@ -4,13 +4,9 @@
# pin this to unstable
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-generators = {
url = "github:nix-community/nixos-generators";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, nixos-generators }:
outputs = { self, nixpkgs }:
let
pkgs = import nixpkgs {
system = "x86_64-linux";
@ -22,8 +18,6 @@
config = { allowUnfree = true; };
};
trusted-public-keys = "firestar:spmMw07mO3cxflq5g2GazhE7ddgEoz6QLwaiCnyz/fg=";
rockchip = { system, uboot }: pkgs.callPackage ./images/rockchip.nix {
inherit uboot;
@ -35,7 +29,9 @@
kernel = (aarch64Pkgs.callPackage ./pkgs/linux { }).testing-rockchip;
userModule = ({ config, ... }: {
trusted-public-keys = "firestar:spmMw07mO3cxflq5g2GazhE7ddgEoz6QLwaiCnyz/fg=";
userModule = {
users.users.asonix = {
isNormalUser = true;
description = "Tavi";
@ -45,31 +41,30 @@
];
initialPassword = "changeme";
};
};
baseModule = ({ lib, ... }: {
# Nix config
nix.extraOptions = ''
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ${trusted-public-keys}
'';
services.openssh = {
enable = true;
settings.PermitRootLogin = lib.mkForce "prohibit-password";
};
});
system = aarch64Pkgs.callPackage ./pkgs/system {
inherit nixpkgs;
inherit kernel;
inherit trusted-public-keys;
extraModules = [
userModule
baseModule
];
};
x86_64-system = pkgs.callPackage ./pkgs/system {
inherit nixpkgs trusted-public-keys;
extraModules = [
userModule
{
networking.hostName = "x86_64-nixos";
}
];
kernel = pkgs.linuxKernel.packageAliases.linux_latest;
};
quartzUBoots = aarch64Pkgs.callPackage ./pkgs/uboot-quartz64 { };
in
{
@ -82,16 +77,6 @@
};
packages.x86_64-linux =
{
x86_64 = nixos-generators.nixosGenerate {
inherit pkgs;
modules = [
x86_64-system.modules.baseModule
];
format = "install-iso";
};
quartz64a = rockchip {
system = system.quartz64a;
uboot = quartzUBoots.ubootQuartz64a;

14
pkgs/system/default.nix
View file

@ -1,4 +1,4 @@
{ nixpkgs, lib, kernel, authorized-keys ? [ ], trusted-public-keys ? "", extraModules ? [ ] }:
{ nixpkgs, lib, kernel, extraModules ? [ ] }:
let
baseModule = {
@ -10,18 +10,6 @@ let
})
];
# Nix config
nix.extraOptions = ''
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ${trusted-public-keys}
'';
users.users.root.openssh.authorizedKeys.keys = authorized-keys;
services.openssh = {
enable = true;
settings.PermitRootLogin = lib.mkForce "prohibit-password";
};
time.timeZone = "UTC";
boot.kernelPackages = kernel;