Format project using nixfmt rfc candidate.
This commit is contained in:
parent
1f63817684
commit
a9f7fe416f
91 changed files with 1347 additions and 1000 deletions
|
@ -3,9 +3,11 @@
|
|||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
with lib;
|
||||
let
|
||||
inherit (config.machine) networkD;
|
||||
in {
|
||||
in
|
||||
{
|
||||
networking = {
|
||||
inherit (config.machine) hostName;
|
||||
useNetworkd = networkD.enable;
|
||||
|
@ -16,44 +18,49 @@ in {
|
|||
# https://github.com/NixOS/nixpkgs/issues/10001#issuecomment-905532069
|
||||
systemd.network = mkIf networkD.enable {
|
||||
enable = true;
|
||||
networks = let
|
||||
networkConfig = {
|
||||
DHCP = "yes";
|
||||
DNSSEC = "yes";
|
||||
DNSOverTLS = "yes";
|
||||
DNS = ["1.1.1.1" "1.0.0.1"];
|
||||
};
|
||||
in {
|
||||
"40-wired" = {
|
||||
enable = true;
|
||||
name = "en*";
|
||||
dhcpV4Config.RouteMetric = 2048;
|
||||
inherit networkConfig;
|
||||
};
|
||||
"40-wireless" = {
|
||||
enable = true;
|
||||
name = "wl*";
|
||||
dhcpV4Config.RouteMetric = 1024;
|
||||
inherit networkConfig;
|
||||
};
|
||||
"50-vlan" = {
|
||||
enable = true;
|
||||
matchConfig = {
|
||||
Name = "br0";
|
||||
};
|
||||
networks =
|
||||
let
|
||||
networkConfig = {
|
||||
DNS = "10.0.0.1";
|
||||
Address = "10.0.0.100/16";
|
||||
# DHCPServer = true;
|
||||
# IPMasquerade = true;
|
||||
DHCP = "yes";
|
||||
DNSSEC = "yes";
|
||||
DNSOverTLS = "yes";
|
||||
DNS = [
|
||||
"1.1.1.1"
|
||||
"1.0.0.1"
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
"40-wired" = {
|
||||
enable = true;
|
||||
name = "en*";
|
||||
dhcpV4Config.RouteMetric = 2048;
|
||||
inherit networkConfig;
|
||||
};
|
||||
"40-wireless" = {
|
||||
enable = true;
|
||||
name = "wl*";
|
||||
dhcpV4Config.RouteMetric = 1024;
|
||||
inherit networkConfig;
|
||||
};
|
||||
"50-vlan" = {
|
||||
enable = true;
|
||||
matchConfig = {
|
||||
Name = "br0";
|
||||
};
|
||||
networkConfig = {
|
||||
DNS = "10.0.0.1";
|
||||
Address = "10.0.0.100/16";
|
||||
# DHCPServer = true;
|
||||
# IPMasquerade = true;
|
||||
};
|
||||
# dhcpServerConfig = {
|
||||
# ServerAddress = "172.16.9.1/12";
|
||||
# PoolOffset = 100;
|
||||
# EmitDNS = false;
|
||||
# };
|
||||
};
|
||||
# dhcpServerConfig = {
|
||||
# ServerAddress = "172.16.9.1/12";
|
||||
# PoolOffset = 100;
|
||||
# EmitDNS = false;
|
||||
# };
|
||||
};
|
||||
};
|
||||
};
|
||||
# Wait for any interface to become available, not for all
|
||||
systemd.services."systemd-networkd-wait-online" = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue