asonix/sbc-deploys
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use customized sd-images repo

Browse source
This commit is contained in:
asonix 2023-02-19 12:27:13 -06:00
parent a1f3fbbb37
commit bbb45957e8
2 changed files with 41 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
flake.lock
View file

@ -38,19 +38,19 @@
"type": "github"
}
},
"image-builder": {
"nixos-aarch64-images": {
"inputs": {
"nixos-generators": "nixos-generators",
"nixpkgs": [
"sd-images",
"nixpkgs"
]
},
"locked": {
"lastModified": 1676751956,
"narHash": "sha256-01e8pPqyIjYojni5DXTknIgcXEQBX6b2ympib/VLKvA=",
"lastModified": 1676782443,
"narHash": "sha256-z0EUeHX/f0z6iO6R+R3JX/QdbYzNaM655Zz6chmz4G4=",
"ref": "refs/heads/main",
"rev": "c7e9be024f54068957c53055932c878782b7f0ce",
"revCount": 64,
"rev": "6f45acca5d7d9aa7a1176168b3ed3c6e309172c5",
"revCount": 68,
"type": "git",
"url": "https://git.asonix.dog/asonix/nixos-aarch64-images"
},
@ -59,43 +59,6 @@
"url": "https://git.asonix.dog/asonix/nixos-aarch64-images"
}
},
"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": [
"image-builder",
"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": 1675921593,
@ -131,11 +94,32 @@
"root": {
"inputs": {
"deploy-rs": "deploy-rs",
"image-builder": "image-builder",
"nixpkgs": "nixpkgs",
"sd-images": "sd-images",
"sops-nix": "sops-nix"
}
},
"sd-images": {
"inputs": {
"nixos-aarch64-images": "nixos-aarch64-images",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1676830855,
"narHash": "sha256-gEIgdSt2D89blEudRbtSIVRdK86zzsUoO0NPRohfohQ=",
"ref": "refs/heads/main",
"rev": "c29904b4b21af864b5cd26583ac1a7cf8cedc0a3",
"revCount": 2,
"type": "git",
"url": "https://git.asonix.dog/asonix/sd-images"
},
"original": {
"type": "git",
"url": "https://git.asonix.dog/asonix/sd-images"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [

26
flake.nix
View file

@ -6,8 +6,8 @@
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
};
image-builder = {
url = "git+https://git.asonix.dog/asonix/nixos-aarch64-images";
sd-images = {
url = "git+https://git.asonix.dog/asonix/sd-images";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs.url = "github:asonix/nixpkgs/asonix/nixos-unstable-pinned";
@ -17,7 +17,7 @@
};
};
outputs = { self, deploy-rs, image-builder, nixpkgs, sops-nix }:
outputs = { self, deploy-rs, sd-images, nixpkgs, sops-nix }:
let
sharedModule = import ./modules/shared;
btrbkModule = import ./modules/btrbk;
@ -27,13 +27,13 @@
networkModule = import ./modules/network;
makeConfig = { hostname, extraModules ? [ ] }:
with image-builder.packages.aarch64-linux.modules;
with sd-images.packages.x86_64-linux.modules;
nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [
sops-nix.nixosModules.sops
sharedModule
userModule
customized
baseModule
{
networking.hostName = hostname;
@ -42,7 +42,7 @@
};
makeGenericK3sConfig = { hostname, enableK3s ? true, serverIp ? null, extraModules ? [ ] }:
with image-builder.packages.aarch64-linux.modules;
with sd-images.packages.x86_64-linux.modules;
makeConfig {
inherit hostname;
@ -77,14 +77,14 @@
];
};
makeRock64K3sConfig = makeBoardK3sConfig image-builder.packages.aarch64-linux.modules.rock64;
makeRock64K3sConfig = makeBoardK3sConfig sd-images.packages.x86_64-linux.modules.rock64;
makeRockPro64K3sConfig = makeBoardK3sConfig image-builder.packages.aarch64-linux.modules.rockPro64v2;
makeRockPro64K3sConfig = makeBoardK3sConfig sd-images.packages.x86_64-linux.modules.rockPro64v2;
makeQuartz64AK3sConfig = makeBoardK3sConfig image-builder.packages.aarch64-linux.modules.quartz64a;
makeQuartz64AK3sConfig = makeBoardK3sConfig sd-images.packages.x86_64-linux.modules.quartz64a;
makeSoQuartzK3sConfig = { hostname, enableK3s ? true, unlockMounts ? true, mountVolumes ? true, selfIp, serverIp ? null }:
with image-builder.packages.aarch64-linux.modules;
with sd-images.packages.x86_64-linux.modules;
let
device = "/dev/mapper/cryptdrive1";
device2 = "/dev/mapper/cryptdrive2";
@ -269,7 +269,7 @@
};
makeBuildConfig = { hostname, macAddress ? null, selfIp }:
with image-builder.packages.aarch64-linux.modules;
with sd-images.packages.x86_64-linux.modules;
let
device = "/btrfs.4G";
mountDir = "/btrfs/loop";
@ -303,7 +303,7 @@
};
makeGarageConfig = { hostname, selfIp, primaryIp ? null, unlockMounts ? true, mountVolumes ? true }:
with image-builder.packages.aarch64-linux.modules;
with sd-images.packages.x86_64-linux.modules;
let
device = "/dev/mapper/cryptdrive1";
mountDir = "/btrfs/hdd";
@ -440,7 +440,7 @@
};
makePostgresConfig = { hostname, selfIp, macAddress, keyFile, primaryIp ? null }:
with image-builder.packages.aarch64-linux.modules;
with sd-images.packages.x86_64-linux.modules;
let
device = "/dev/mapper/cryptdrive1";
mountDir = "/btrfs/ssd";