diff options
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | hosts/toaster/network/default.nix | 76 | ||||
| -rw-r--r-- | modules/gnome.nix | 1 |
3 files changed, 29 insertions, 50 deletions
@@ -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 diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix index 028648f..e633342 100644 --- a/hosts/toaster/network/default.nix +++ b/hosts/toaster/network/default.nix @@ -1,61 +1,39 @@ -{ 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; - networking = { - hostName = "toaster"; - firewall.enable = true; - wireguard.enable = true; - wireless.iwd.enable = true; - }; - - services.resolved = { - enable = true; - dnssec = "false"; - fallbackDns = [ - "9.9.9.9" - "2620:fe::fe" - "149.112.112.112" - "2620:fe::9" - ]; - }; + systemd.network = { + enable = true; + wait-online.enable = false; # uplink is managed by networkmanager + }; - # we might have no interwebs at all - systemd.network.wait-online.enable = false; + users.users."0xa".extraGroups = [ "networkmanager" ]; - # uplinks - systemd.network.networks = { - "10-ether-uplink" = { - matchConfig.Name = "enp1s0f0"; - networkConfig = { - DHCP = "yes"; - IPv6AcceptRA = true; - }; + networking = { + hostName = "toaster"; + firewall.enable = true; + wireguard.enable = 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; - }; + + services.resolved = { + enable = true; + dnssec = "false"; + fallbackDns = [ + "9.9.9.9" + "2620:fe::fe" + "149.112.112.112" + "2620:fe::9" + ]; }; - }; -} + } diff --git a/modules/gnome.nix b/modules/gnome.nix index 582cd38..999ebe2 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -94,6 +94,7 @@ twemoji-color-font twitter-color-emoji iosevka-bin + nerd-fonts.hack ]; fonts.enableDefaultPackages = true; |