Compare commits
No commits in common. "main" and "main" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,3 +1 @@
|
||||||
.direnv
|
.direnv
|
||||||
result
|
|
||||||
.gcroots
|
|
||||||
|
|
|
@ -9,6 +9,7 @@ let
|
||||||
colmena
|
colmena
|
||||||
flake-registry
|
flake-registry
|
||||||
nixos-hardware
|
nixos-hardware
|
||||||
|
nixpkgs-unstable
|
||||||
srvos
|
srvos
|
||||||
disko
|
disko
|
||||||
;
|
;
|
||||||
|
|
85
flake.lock
85
flake.lock
|
@ -10,11 +10,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718371084,
|
"lastModified": 1716561646,
|
||||||
"narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
|
"narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "3a56735779db467538fb2e577eda28a9daacaca6",
|
"rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -32,11 +32,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717279440,
|
"lastModified": 1711742460,
|
||||||
"narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",
|
"narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=",
|
||||||
"owner": "zhaofengli",
|
"owner": "zhaofengli",
|
||||||
"repo": "attic",
|
"repo": "attic",
|
||||||
"rev": "717cc95983cdc357bc347d70be20ced21f935843",
|
"rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -76,11 +76,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717025063,
|
"lastModified": 1702918879,
|
||||||
"narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=",
|
"narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e",
|
"rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -118,11 +118,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718846788,
|
"lastModified": 1716431128,
|
||||||
"narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
|
"narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
|
"rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -170,11 +170,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717285511,
|
"lastModified": 1715865404,
|
||||||
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
|
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
|
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -186,11 +186,11 @@
|
||||||
"flake-registry": {
|
"flake-registry": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717415742,
|
"lastModified": 1705308826,
|
||||||
"narHash": "sha256-HKvoLGZUsBpjkxWkdtctGYj6RH0bl6vcw0OjTOqyzJk=",
|
"narHash": "sha256-Z3xTYZ9EcRIqZAufZbci912MUKB0sD+qxi/KTGMFVwY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "flake-registry",
|
"repo": "flake-registry",
|
||||||
"rev": "895a65f8d5acf848136ee8fe8e8f736f0d27df96",
|
"rev": "9c69f7bd2363e71fe5cd7f608113290c7614dcdd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -257,11 +257,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718530513,
|
"lastModified": 1717527182,
|
||||||
"narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
|
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
|
"rev": "845a5c4c073f74105022533907703441e0464bc3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -273,11 +273,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719069430,
|
"lastModified": 1716715385,
|
||||||
"narHash": "sha256-d9KzCJv3UG6nX9Aur5OSEf4Uj+ywuxojhiCiRKYVzXA=",
|
"narHash": "sha256-fe6Z33pbfqu4TI5ijmcaNc5vRBs633tyxJ12HTghy3w=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "e8232c132a95ddc62df9d404120ad4ff53862910",
|
"rev": "2e7d6c568063c83355fe066b8a8917ee758de1b8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -318,13 +318,13 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718983919,
|
"lastModified": 1716715802,
|
||||||
"narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=",
|
"narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "90338afd6177fc683a04d934199d693708c85a3b",
|
"rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -334,13 +334,29 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1709742294,
|
||||||
|
"narHash": "sha256-8iPomMqw7grXVsugMJhsnHdbre8LnXOQUtHtMXRaWqc=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "56051fbe049bf39adc1f08eb51740c226a4c3b90",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "56051fbe049bf39adc1f08eb51740c226a4c3b90",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719099906,
|
"lastModified": 1716741358,
|
||||||
"narHash": "sha256-xo1cNkVBW7NxTU5zMu0B7ZkismtkHfTRWfhBXbNnp9g=",
|
"narHash": "sha256-4bxptwbmplGKq3W4tl6Zem/bOHsdLP4DSPcm/FfCaFE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "315cf1f8c5f5e92150d81ccafba7525c54327094",
|
"rev": "c65a3bde6793b437a705edfe5ff8435cbb8307a2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -360,6 +376,7 @@
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"srvos": "srvos"
|
"srvos": "srvos"
|
||||||
}
|
}
|
||||||
|
@ -371,11 +388,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718844164,
|
"lastModified": 1716425501,
|
||||||
"narHash": "sha256-QUXWv6llKIQ5To2N24d9dRI78Hqfm9iFyhvmvlOICNo=",
|
"narHash": "sha256-BSLhmGYY1khyyBAjraR+N0Pa9Nha/et5yQQlEZxcfkU=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "srvos",
|
"repo": "srvos",
|
||||||
"rev": "557ff94aa1b48a723f8fa16eb9e7a2e6de991682",
|
"rev": "1122cd50a23647e09c3e7a679d37ec02113bc412",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -10,7 +10,9 @@
|
||||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||||
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
|
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||||
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
|
# contains kernel 6.7.7, do not update
|
||||||
|
nixpkgs.url = "github:NixOS/nixpkgs/56051fbe049bf39adc1f08eb51740c226a4c3b90";
|
||||||
|
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||||
nur.url = "github:nix-community/NUR";
|
nur.url = "github:nix-community/NUR";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ inputs, lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
gcc-system-features = arch: lib.optionals (arch != null) ([ "gccarch-${arch}" ]
|
gcc-system-features = arch: lib.optionals (arch != null) ([ "gccarch-${arch}" ]
|
||||||
++ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${arch});
|
++ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${arch});
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -9,21 +9,25 @@ in
|
||||||
../modules/hardware/supermicro-H12SSL-i.nix
|
../modules/hardware/supermicro-H12SSL-i.nix
|
||||||
../modules/iperf-server.nix
|
../modules/iperf-server.nix
|
||||||
../modules/hypervisor.nix
|
../modules/hypervisor.nix
|
||||||
|
../modules/hydra/coordinator.nix
|
||||||
../modules/android-cache.nix
|
../modules/android-cache.nix
|
||||||
../modules/garage.nix
|
../modules/garage.nix
|
||||||
../modules/users/friends.nix
|
../modules/users/friends.nix
|
||||||
../modules/bagel-container.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "epyc";
|
networking.hostName = "epyc";
|
||||||
|
|
||||||
security.acme.acceptTerms = true;
|
|
||||||
security.acme.defaults.email = "epyc@lahfa.xyz";
|
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
virtualisation.docker = {
|
||||||
|
enable = true;
|
||||||
|
rootless.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# TODO: there's a critical bug on 6.8+ where btrfs won't mount the rootfs at all.
|
||||||
|
# Do not upgrade until it is fixed. Ping Raito when needed.
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_6_7;
|
||||||
|
|
||||||
# Open public access to our PostgreSQL.
|
# Open public access to our PostgreSQL.
|
||||||
services.postgresql.enable = true;
|
services.postgresql.enable = true;
|
||||||
|
|
|
@ -1,46 +0,0 @@
|
||||||
# Stateful/mutable container used for Bagel (tm) related infra (mostly
|
|
||||||
# rebuilding nixpkgs a lot).
|
|
||||||
#
|
|
||||||
# System image is stored at /var/lib/machines/bagel.
|
|
||||||
{
|
|
||||||
systemd.nspawn.bagel = {
|
|
||||||
execConfig = {
|
|
||||||
Boot = true;
|
|
||||||
Ephemeral = false;
|
|
||||||
PrivateUsers = true;
|
|
||||||
NotifyReady = true;
|
|
||||||
LinkJournal = "try-guest";
|
|
||||||
};
|
|
||||||
|
|
||||||
networkConfig = {
|
|
||||||
Bridge = "wan-br";
|
|
||||||
VirtualEthernetExtra = "vb-bagel-v4:host1";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services."systemd-nspawn@bagel" = {
|
|
||||||
wantedBy = [ "machines.target" ];
|
|
||||||
wants = [ "network.target" ];
|
|
||||||
after = [ "network.target" ];
|
|
||||||
overrideStrategy = "asDropin";
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.network.networks."20-vb-bagel-v4" = {
|
|
||||||
matchConfig.Name = "vb-bagel-v4";
|
|
||||||
networkConfig.Address = [ "172.16.100.1/24" ];
|
|
||||||
networkConfig.IPMasquerade = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Configure a local Nix builder account, since getting sandboxing and KVM
|
|
||||||
# working inside the container will be tricky.
|
|
||||||
users.users.bagel-builder = {
|
|
||||||
isSystemUser = true;
|
|
||||||
group = "nogroup";
|
|
||||||
home = "/var/empty";
|
|
||||||
shell = "/bin/sh";
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAvUT9YBig9LQPHgypIBHQuC32XqDKxlFZ2CfgDi0ZKx"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
nix.settings.trusted-users = [ "bagel-builder" ];
|
|
||||||
}
|
|
|
@ -34,6 +34,7 @@ in
|
||||||
pkgs.gh
|
pkgs.gh
|
||||||
pkgs.nix
|
pkgs.nix
|
||||||
pkgs.nix-output-monitor
|
pkgs.nix-output-monitor
|
||||||
|
inputs.attic.packages.x86_64-linux.attic
|
||||||
];
|
];
|
||||||
environment.PYTHONPATH = "${python.withPackages (_: [package])}/${python.sitePackages}";
|
environment.PYTHONPATH = "${python.withPackages (_: [package])}/${python.sitePackages}";
|
||||||
environment.MASTER_URL = ''TCP:2a01\\:e34\\:ec2a\\:8e60\\:8ec7\\:b5d2\\:f663\\:a67a:9989'';
|
environment.MASTER_URL = ''TCP:2a01\\:e34\\:ec2a\\:8e60\\:8ec7\\:b5d2\\:f663\\:a67a:9989'';
|
||||||
|
|
|
@ -14,43 +14,33 @@
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
boot.initrd.services.lvm.enable = true;
|
boot.initrd.extraUtilsCommands = ''
|
||||||
boot.initrd.systemd.enable = true;
|
copy_bin_and_libs ${pkgs.nvme-cli}/bin/nvme
|
||||||
|
copy_bin_and_libs ${pkgs.util-linux}/bin/blkzone
|
||||||
|
copy_bin_and_libs ${pkgs.util-linux}/bin/lsblk
|
||||||
|
'';
|
||||||
|
|
||||||
fileSystems."/experiments" =
|
boot.initrd.systemd.enable = lib.mkForce false;
|
||||||
{ device = "/dev/disk/by-uuid/40ef7d25-91c5-41e4-a40f-b0fb93658ffe";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/53cc33a3-1488-44c4-8f5d-a2bc67914274";
|
{ device = "/dev/disk/by-uuid/3a81ba8f-f5bb-446c-89a3-ad77e354dae0";
|
||||||
fsType = "xfs";
|
fsType = "btrfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/nix" =
|
boot.initrd.luks.devices."nixroot" = {
|
||||||
{ device = "/dev/disk/by-uuid/cee7b903-53f6-4967-b95d-654d34ccd460";
|
device = "/dev/disk/by-uuid/c10d2822-cb83-4666-98f8-0aa04be259bc";
|
||||||
fsType = "xfs";
|
keyFile = "/dev/zero";
|
||||||
};
|
keyFileSize = 1;
|
||||||
|
};
|
||||||
fileSystems."/home" =
|
|
||||||
{ device = "/dev/disk/by-uuid/5625935d-579b-41e4-be35-03df8437bc2c";
|
|
||||||
fsType = "xfs";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/var" =
|
|
||||||
{ device = "/dev/disk/by-uuid/33bf7f4e-37f5-4121-84ac-70d06964ea21";
|
|
||||||
fsType = "xfs";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/AFF2-3149";
|
{ device = "/dev/disk/by-uuid/AFF2-3149";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/disk/by-uuid/93e251e1-1bfc-4bd4-8585-ea2eae7795bf"; }
|
[ { device = "/dev/disk/by-uuid/93e251e1-1bfc-4bd4-8585-ea2eae7795bf"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
'')
|
'')
|
||||||
config.networking.newtype.hosts);
|
config.networking.newtype.hosts);
|
||||||
|
|
||||||
# leave container interfaces alone unless otherwise specified
|
# leave container interfaces alone
|
||||||
systemd.network.networks."95-veth".extraConfig = ''
|
systemd.network.networks."05-veth".extraConfig = ''
|
||||||
[Match]
|
[Match]
|
||||||
Driver = veth
|
Driver = veth
|
||||||
|
|
||||||
|
@ -34,27 +34,10 @@
|
||||||
linkConfig.Name = "nat-lan";
|
linkConfig.Name = "nat-lan";
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.network.netdevs."10-wan-br" = {
|
|
||||||
netdevConfig.Name = "wan-br";
|
|
||||||
netdevConfig.Kind = "bridge";
|
|
||||||
netdevConfig.MACAddress = "none";
|
|
||||||
bridgeConfig.MulticastSnooping = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.network.links."10-wan-br" = {
|
|
||||||
matchConfig.Name = "wan-br";
|
|
||||||
linkConfig.MACAddressPolicy = "none";
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.network.networks."10-wan-br" = {
|
|
||||||
matchConfig.Name = "wan-br";
|
|
||||||
linkConfig.RequiredForOnline = true;
|
|
||||||
networkConfig.Address = [ config.networking.newtype.currentHost.ipv6 ];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.network.networks."10-wan" = {
|
systemd.network.networks."10-wan" = {
|
||||||
matchConfig.Name = "wan";
|
matchConfig.Name = "wan";
|
||||||
networkConfig.Bridge = "wan-br";
|
linkConfig.RequiredForOnline = true;
|
||||||
|
networkConfig.Address = [ config.networking.newtype.currentHost.ipv6 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.network.links."10-wan" = {
|
systemd.network.links."10-wan" = {
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
whois
|
whois
|
||||||
|
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
|
inputs.attic.packages.x86_64-linux.attic
|
||||||
jq
|
jq
|
||||||
psmisc
|
psmisc
|
||||||
libarchive
|
libarchive
|
||||||
|
@ -35,6 +36,8 @@
|
||||||
usbutils
|
usbutils
|
||||||
|
|
||||||
ipmitool
|
ipmitool
|
||||||
|
|
||||||
|
nix-top
|
||||||
# tries to default to soft-float due to out-dated cc-rs
|
# tries to default to soft-float due to out-dated cc-rs
|
||||||
] ++ lib.optional (!stdenv.hostPlatform.isRiscV) bandwhich;
|
] ++ lib.optional (!stdenv.hostPlatform.isRiscV) bandwhich;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue