This commit is contained in:
Oystein Kristoffer Tveit 2024-08-26 20:57:12 +02:00
parent c12a47cee0
commit 5093e85b0c
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
4 changed files with 81 additions and 1 deletions

57
flake.lock generated
View File

@ -1,5 +1,26 @@
{
"nodes": {
"dibbler": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1693682284,
"narHash": "sha256-FvVCkHH80YyUiqQlnGNr49rZRBniihF6YRpytguEkFQ=",
"ref": "refs/heads/master",
"rev": "8a6a0c12ba37e239684d2de1be12fd73903cfb2c",
"revCount": 193,
"type": "git",
"url": "https://git.pvv.ntnu.no/Projects/dibbler.git"
},
"original": {
"type": "git",
"url": "https://git.pvv.ntnu.no/Projects/dibbler.git"
}
},
"disko": {
"inputs": {
"nixpkgs": [
@ -22,7 +43,7 @@
},
"fix-python": {
"inputs": {
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"grzegorz",
"nixpkgs"
@ -46,6 +67,24 @@
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1692799911,
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
@ -229,6 +268,7 @@
},
"root": {
"inputs": {
"dibbler": "dibbler",
"disko": "disko",
"grzegorz": "grzegorz",
"grzegorz-clients": "grzegorz-clients",
@ -276,6 +316,21 @@
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View File

@ -17,6 +17,9 @@
pvv-calendar-bot.url = "git+https://git.pvv.ntnu.no/Projects/calendar-bot.git";
pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs";
dibbler.url = "git+https://git.pvv.ntnu.no/Projects/dibbler.git";
dibbler.inputs.nixpkgs.follows = "nixpkgs";
matrix-next.url = "github:dali99/nixos-matrix-modules/v0.6.0";
matrix-next.inputs.nixpkgs.follows = "nixpkgs";
@ -124,6 +127,13 @@
];
};
buskerud = stableNixosConfig "buskerud" { };
skrott = stableNixosConfig "skrott" {
system = "aarch64-linux";
modules = [
(nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64.nix")
inputs.dibbler.nixosModules.default
];
};
};
nixosModules = {
@ -147,6 +157,7 @@
simplesamlphp = pkgs.callPackage ./packages/simplesamlphp { };
skrot = self.nixosConfigurations.skrott.config.system.build.sdImage;
} //
(nixlib.pipe null [
(_: pkgs.callPackage ./packages/mediawiki-extensions { })

View File

@ -0,0 +1,10 @@
{ lib, values, ... }: {
system.stateVersion = "22.05";
systemd.network.networks."30-all" = values.defaultNetworkConfig // {
matchConfig.Name = "eth0";
address = with values.hosts.skrott; [ (ipv4 + "/25") (ipv6 + "/64") ];
};
networking.hostName = lib.mkForce "skrot";
}

View File

@ -63,6 +63,10 @@ in rec {
ipv4 = pvv-ipv4 231;
ipv6 = pvv-ipv6 231;
};
skrott = {
ipv4 = pvv-ipv4 235;
ipv6 = pvv-ipv6 235;
};
};
defaultNetworkConfig = {