diff --git a/flake.lock b/flake.lock index e088cc7..ccb1bf2 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1740253065, - "narHash": "sha256-ucwXcftJ7DHjk1UA2LmfHXkDPoCgfB4uadwFUCBvc8w=", - "rev": "82c7e76c9c2d829dc11c22b32173a40056cc44ef", + "lastModified": 1740025708, + "narHash": "sha256-TQ8EQoulNFD2nP94Aw3W17cjlV3F+fMpDsV6LOrrkbY=", + "rev": "e335a26d5cd8371ea836d1166b627eaf17427299", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/82c7e76c9c2d829dc11c22b32173a40056cc44ef.tar.gz?rev=82c7e76c9c2d829dc11c22b32173a40056cc44ef" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e335a26d5cd8371ea836d1166b627eaf17427299.tar.gz?rev=e335a26d5cd8371ea836d1166b627eaf17427299" }, "original": { "type": "tarball", diff --git a/flake.nix b/flake.nix index 0038003..342df6a 100644 --- a/flake.nix +++ b/flake.nix @@ -111,7 +111,7 @@ ./modules/basic-tools ./modules/binary-caches.nix ./modules/devtools.nix - ./modules/gnome.nix + ./modules/sway.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 6d96c3c..ee0bdbe 100644 --- a/hosts/toaster/network/default.nix +++ b/hosts/toaster/network/default.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, pkgs, ... }: { imports = [ ./mullvad.nix @@ -6,26 +6,21 @@ ./zw.nix ]; - # 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; + environment.systemPackages = with pkgs; [ + iwgtk + impala + ]; - systemd.network = { - enable = true; - wait-online.enable = false; # uplink is managed by networkmanager - }; - - users.users."0xa".extraGroups = [ "networkmanager" ]; + # kick out networkmanager + networking.networkmanager.enable = lib.mkForce false; + networking.useNetworkd = true; + systemd.network.enable = true; networking = { hostName = "toaster"; firewall.enable = true; wireguard.enable = true; + wireless.iwd.enable = true; }; services.resolved = { @@ -39,4 +34,38 @@ ]; }; + # 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; + }; + }; + }; + } diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix index a917168..d5e81d3 100644 --- a/modules/basic-tools/default.nix +++ b/modules/basic-tools/default.nix @@ -39,6 +39,7 @@ exfatprogs nmap bind + nnn lf man-pages unzip @@ -49,7 +50,6 @@ sshfs whois mtr - joshuto ] ++ ( if config.networking.hostName == "toaster" then diff --git a/modules/sway.nix b/modules/sway.nix index 47f5698..44ee647 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -27,7 +27,6 @@ in audacity spotify-player zathura - ncdu ]; # Enable sound.