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

Update deps, remove mkForce, remove / fs

Browse source
This commit is contained in:
asonix 2023-03-10 22:26:21 -06:00
parent c4a5b89e46
commit 4e2cad102a
4 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.lock
View file

@ -55,11 +55,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677676435, "lastModified": 1678380223,
"narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", "narHash": "sha256-HUxnK38iqrX84QdQxbFcosRKV3/koj1Zzp5b5aP4lIo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", "rev": "1e2590679d0ed2cee2736e8b80373178d085d263",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1677560965, "lastModified": 1677948530,
"narHash": "sha256-Tqwt5alTtMnbYUPKCYRYZqlfbjprLgDWqjMhXpFMQ6k=", "narHash": "sha256-BkQjq8AGHD55RJe4PUnrWRZZ8jS64p/k0bGDck5wKwY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "40968a3aa489191cf4b7ba85cf2a54d8a75c8daa", "rev": "d51554151a91cd4543a7620843cc378e3cbc767e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +98,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1677873285, "lastModified": 1677977689,
"narHash": "sha256-MwQn3S0q14ctX0PPUhVHOzF++MifLh/SHmb1+A32lYg=", "narHash": "sha256-2eQCJQvnEvI/gpfiBe/rUf2FziPeteiyyPzUNU8GNww=",
"owner": "nabam", "owner": "nabam",
"repo": "nixos-rockchip", "repo": "nixos-rockchip",
"rev": "e095ced30aad1a5c45eaf07abda76fc8c31c16a4", "rev": "38db05d8724b9e694248ca049f1f7559e4926d69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -128,11 +128,11 @@
"rockchip": "rockchip" "rockchip": "rockchip"
}, },
"locked": { "locked": {
"lastModified": 1677971590, "lastModified": 1678508189,
"narHash": "sha256-D6RwLzhUMYsVVc6wV/703mdEZC1PPTFc5yKaC22b3WM=", "narHash": "sha256-AMm92WWStP2M7at46Je9ULCQQCQLpr2E756+wfy2Vu4=",
"ref": "asonix/nabam-sd-image", "ref": "asonix/nabam-sd-image",
"rev": "3041519a837a11c05675fc480ffcf403eaca495f", "rev": "cf073db55bb48b977644991bc649ffb5671eabca",
"revCount": 17, "revCount": 20,
"type": "git", "type": "git",
"url": "https://git.asonix.dog/asonix/sd-images" "url": "https://git.asonix.dog/asonix/sd-images"
}, },
@ -150,11 +150,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1677833841, "lastModified": 1678440572,
"narHash": "sha256-yHZFGe7dhBE43FFWKiWc29NuveH+nfyTT6oKyFDEMys=", "narHash": "sha256-zfL09Yy6H7QQwfacCPL0gOfWpVkTbE5jXJh5oZmGf8g=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "128e9b29ddd88ceb634a28f7dbbfee7b895f005f", "rev": "1568702de0d2488c1e77011a9044de7fadec80c4",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
flake.nix
View file

@ -242,7 +242,7 @@
}; };
in in
if unlockMounts && mountVolumes then if unlockMounts && mountVolumes then
lib.mkForce fileSystemConfig fileSystemConfig
else else
{ }; { };
@ -292,7 +292,7 @@
inherit device subvolumes; inherit device subvolumes;
}) })
({ lib, ... }: { ({ lib, ... }: {
fileSystems = lib.mkForce { fileSystems = {
"${mountDir}" = { "${mountDir}" = {
inherit device; inherit device;
fsType = "btrfs"; fsType = "btrfs";
@ -420,7 +420,7 @@
}; };
}; };
in in
if unlockMounts && mountVolumes then lib.mkForce fileSystemConfig else { }; if unlockMounts && mountVolumes then fileSystemConfig else { };
networking.firewall.enable = false; networking.firewall.enable = false;
}) })
@ -468,7 +468,7 @@
''; '';
}; };
fileSystems = lib.mkForce { fileSystems = {
"${mountDir}" = { "${mountDir}" = {
inherit device; inherit device;
fsType = "btrfs"; fsType = "btrfs";
@ -605,6 +605,13 @@
macAddress = "02:6b:c5:f0:d7:6d"; macAddress = "02:6b:c5:f0:d7:6d";
}; };
k3s-rock7 = makeRock64K3sConfig {
hostname = "k3s-rock7";
selfIp = "192.168.20.116";
serverIp = "192.168.20.120";
macAddress = "02:5b:c4:cf:25:c2";
};
k3s-quartza1 = makeQuartz64AK3sConfig { k3s-quartza1 = makeQuartz64AK3sConfig {
hostname = "k3s-quartza1"; hostname = "k3s-quartza1";
selfIp = "192.168.20.160"; selfIp = "192.168.20.160";
@ -638,6 +645,7 @@
{ name = "k3s-rock4"; ip = "192.168.20.113"; } { name = "k3s-rock4"; ip = "192.168.20.113"; }
{ name = "k3s-rock5"; ip = "192.168.20.114"; } { name = "k3s-rock5"; ip = "192.168.20.114"; }
{ name = "k3s-rock6"; ip = "192.168.20.115"; } { name = "k3s-rock6"; ip = "192.168.20.115"; }
{ name = "k3s-rock7"; ip = "192.168.20.116"; }
{ name = "k3s-quartza1"; ip = "192.168.20.160"; } { name = "k3s-quartza1"; ip = "192.168.20.160"; }
{ name = "k3s-rockpro1"; ip = "192.168.20.180"; } { name = "k3s-rockpro1"; ip = "192.168.20.180"; }
]; ];

5
modules/shared/default.nix
View file

@ -8,11 +8,6 @@
# Enables the generation of /boot/extlinux/extlinux.conf # Enables the generation of /boot/extlinux/extlinux.conf
boot.loader.generic-extlinux-compatible.enable = true; boot.loader.generic-extlinux-compatible.enable = true;
fileSystems."/" = {
device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
fsType = "ext4";
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
bottom bottom
cryptsetup cryptsetup

2
modules/subvolumes/default.nix
View file

@ -3,7 +3,7 @@
{ lib, ... }: { lib, ... }:
{ {
fileSystems = lib.mkForce (builtins.foldl' fileSystems = (builtins.foldl'
(acc: subvol: (acc: subvol:
let let
length = builtins.stringLength subvol; length = builtins.stringLength subvol;