0xa/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switch to networkmanager for the desktop

Browse source
This commit is contained in:
Grigory Shipunov 2023-04-29 00:40:53 +02:00
parent 2c558dfa3f
commit ce6c882435
Signed by: 0xa
GPG key ID: 91FA5E5BF9AA901C
3 changed files with 20 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hosts/toaster/default.nix
View file

@ -3,7 +3,6 @@
./amd.nix ./amd.nix
./hardware-configuration.nix ./hardware-configuration.nix
./irc.nix ./irc.nix
./network-vpns.nix
./network.nix ./network.nix
./secrets.nix ./secrets.nix
./secure-boot.nix ./secure-boot.nix
@ -36,6 +35,7 @@
"plugdev" "plugdev"
"dialout" "dialout"
"bluetooth" "bluetooth"
"networkmanager"
]; ];
group = "users"; group = "users";
home = "/home/grue"; home = "/home/grue";
@ -52,5 +52,4 @@
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.05"; # Did you read the comment? system.stateVersion = "23.05"; # Did you read the comment?
} }

4
hosts/toaster/hardware-configuration.nix
View file

@ -83,8 +83,8 @@
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true; networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true;
#networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
networking.interfaces.wlan0.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

52
hosts/toaster/network.nix
View file

@ -4,10 +4,7 @@
networking = { networking = {
hostName = "toaster"; hostName = "toaster";
firewall.enable = true; firewall.enable = true;
networkmanager.enable = false;
useNetworkd = true;
wireguard.enable = true; wireguard.enable = true;
wireless.iwd.enable = true;
}; };
services.resolved = { services.resolved = {
@ -21,37 +18,22 @@
]; ];
}; };
# workaround for networkd waiting for shit # fixup the rpfilter fucking up the networkmanager wireguard
systemd.services.systemd-networkd-wait-online.serviceConfig.ExecStart = [ networking.firewall = {
"" # clear old command # if packets are still dropped, they will show up in dmesg
"${config.systemd.package}/lib/systemd/systemd-networkd-wait-online --any" logReversePathDrops = true;
]; # wireguard trips rpfilter up
extraCommands = ''
systemd.network = { ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN
enable = true; ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN
ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --sport 1337 -j RETURN
networks."10-ether" = { ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --dport 1337 -j RETURN
matchConfig.MACAddress = "e8:80:88:2f:c6:70"; '';
networkConfig = { extraStopCommands = ''
DHCP = "yes"; ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN || true
IPv6AcceptRA = true; ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true
}; ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --sport 1337 -j RETURN || true
}; ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 1337 -j RETURN || true
networks."10-dock" = { '';
matchConfig.Name = "enp5s0f4u1u1";
networkConfig = {
DHCP = "yes";
IPv6AcceptRA = true;
};
dhcpV4Config = { RouteMetric = 666; };
};
networks."10-wlan" = {
# matchConfig.MACAddress = "04:7b:cb:2a:aa:8c";
matchConfig.Name = "wlan0";
networkConfig = {
DHCP = "yes";
IPv6AcceptRA = true;
};
};
}; };
} }