From 5093e85b0cade8a15a05de214632fb6b743afd45 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 26 Aug 2024 20:57:12 +0200 Subject: [PATCH] WIP --- flake.lock | 57 +++++++++++++++++++++++++++++++++- flake.nix | 11 +++++++ hosts/skrott/configuration.nix | 10 ++++++ values.nix | 4 +++ 4 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 hosts/skrott/configuration.nix diff --git a/flake.lock b/flake.lock index 4931629..8e59b89 100644 --- a/flake.lock +++ b/flake.lock @@ -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", diff --git a/flake.nix b/flake.nix index ac2839d..4295a1e 100644 --- a/flake.nix +++ b/flake.nix @@ -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 { }) diff --git a/hosts/skrott/configuration.nix b/hosts/skrott/configuration.nix new file mode 100644 index 0000000..008447d --- /dev/null +++ b/hosts/skrott/configuration.nix @@ -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"; +} diff --git a/values.nix b/values.nix index 2e11f4f..c8f948b 100644 --- a/values.nix +++ b/values.nix @@ -63,6 +63,10 @@ in rec { ipv4 = pvv-ipv4 231; ipv6 = pvv-ipv6 231; }; + skrott = { + ipv4 = pvv-ipv4 235; + ipv6 = pvv-ipv6 235; + }; }; defaultNetworkConfig = {