Revert "back to declarative network"

This reverts commit 3511f194c5.
This commit is contained in:
Grisha Shipunov 2025-01-10 22:28:05 +01:00
parent 5c33ef7aff
commit 34b05a2c8c
3 changed files with 32 additions and 53 deletions

View file

@ -58,7 +58,7 @@
./modules/basic-tools
./modules/binary-caches.nix
./modules/devtools.nix
./modules/sway.nix
./modules/gnome.nix
./modules/gnupg.nix
./modules/radio.nix
./modules/science.nix

View file

@ -1,20 +1,28 @@
{ lib, config, pkgs, ... }: {
{ lib, config, ... }: {
imports = [
./mullvad.nix
./dumpdvb.nix
./zw.nix
];
# kick out networkmanager
networking.networkmanager.enable = lib.mkForce false;
networking.useNetworkd = true;
systemd.network.enable = true;
# Networkmanager shouldn't interfere with systemd managed interfaces
networking.networkmanager.unmanaged =
let
systemd_netdevs = lib.attrsets.attrValues (lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs);
in
systemd_netdevs;
systemd.network = {
enable = true;
wait-online.enable = false; # uplink is managed by networkmanager
};
users.users."0xa".extraGroups = [ "networkmanager" ];
networking = {
hostName = "toaster";
firewall.enable = true;
wireguard.enable = true;
wireless.iwd.enable = true;
};
services.resolved = {
@ -28,34 +36,4 @@
];
};
# we might have no interwebs at all
systemd.network.wait-online.enable = false;
# uplinks
systemd.network.networks = {
"10-ether-uplink" = {
matchConfig.Name = "enp1s0f0";
networkConfig = {
DHCP = "yes";
IPv6AcceptRA = true;
};
};
"10-dock-uplink" = {
matchConfig.Name = "enp5s0f4u1u1";
networkConfig = {
DHCP = "yes";
IPv6AcceptRA = true;
};
dhcpV4Config = { RouteMetric = 666; };
dhcpV6Config = { RouteMetric = 666; };
};
"wlan-uplink" = {
matchConfig.Name = "wlan0";
networkConfig = {
DHCP = "yes";
IPv6AcceptRA = true;
};
};
};
}

View file

@ -94,6 +94,7 @@
twemoji-color-font
twitter-color-emoji
iosevka-bin
nerd-fonts.hack
];
fonts.enableDefaultPackages = true;