Compare commits
2 commits
0d53c533b3
...
3f1b629e75
Author | SHA1 | Date | |
---|---|---|---|
3f1b629e75 | |||
b570a298a2 |
3 changed files with 38 additions and 27 deletions
|
@ -1,5 +1,25 @@
|
|||
{ lib, modulesPath, ... }:
|
||||
{
|
||||
systemd.network.enable = true;
|
||||
systemd.network.networks."10-wan" = {
|
||||
matchConfig.Name = "enp1s0";
|
||||
networkConfig.DHCP = "ipv4";
|
||||
address = [
|
||||
"2a01:4f9:c013:bd27::1/64"
|
||||
];
|
||||
routes = [
|
||||
{ Gateway = "fe80::1"; }
|
||||
];
|
||||
};
|
||||
|
||||
boot.loader = {
|
||||
efi.canTouchEfiVariables = false;
|
||||
systemd-boot.enable = false;
|
||||
grub = {
|
||||
enable = true;
|
||||
devices = [ "/dev/sda" ];
|
||||
};
|
||||
};
|
||||
system.stateVersion = "25.05";
|
||||
|
||||
imports = [
|
||||
|
@ -19,7 +39,5 @@
|
|||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
}
|
||||
|
|
|
@ -4,19 +4,24 @@
|
|||
jool = {
|
||||
enable = true;
|
||||
siit.default = {
|
||||
global.pool6 = "${config.custom.gua_pref}46::/96";
|
||||
global.pool6 = "2a01:4f9:c013:bd27:46::/96";
|
||||
|
||||
# Explicit address mappings
|
||||
eamt = [
|
||||
{
|
||||
# Cache/CI
|
||||
"ipv6 prefix" = "${config.custom.gua_pref}d2:be24:11ff:fe7f:f84c/128";
|
||||
"ipv4 prefix" = "95.217.30.123/32";
|
||||
}
|
||||
{
|
||||
# Forgejo
|
||||
"ipv6 prefix" = "${config.custom.gua_pref}d2:be24:11ff:feee:9c55/128";
|
||||
"ipv4 prefix" = "157.180.86.116/32";
|
||||
"ipv4 prefix" = "95.216.180.210/32";
|
||||
}
|
||||
{
|
||||
# Idacloud
|
||||
"ipv6 prefix" = "${config.custom.gua_pref}d3:be24:11ff:fece:7d63/128";
|
||||
"ipv4 prefix" = "95.216.180.210/32";
|
||||
"ipv4 prefix" = "95.217.26.243/32";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
@ -5,34 +5,22 @@
|
|||
device = "/dev/sda";
|
||||
type = "disk";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
boot = {
|
||||
name = "boot";
|
||||
type = "EF02";
|
||||
size = "1M";
|
||||
};
|
||||
ESP = {
|
||||
name = "ESP";
|
||||
type = "EF00";
|
||||
size = "512M";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
mountOptions = [ "umask=0077" ];
|
||||
};
|
||||
};
|
||||
root = {
|
||||
type = "table";
|
||||
format = "msdos";
|
||||
partitions = [
|
||||
{
|
||||
name = "nixos";
|
||||
size = "100%";
|
||||
part-type = "primary";
|
||||
bootable = true;
|
||||
start = "1M";
|
||||
end = "100%";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "ext4";
|
||||
mountpoint = "/";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue