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

Revert "sway config"

Browse source 
This reverts commit 73df58ccb0.
This commit is contained in:
Grisha Shipunov 2025-02-19 01:57:32 +01:00
parent db8daf4f06
commit 019a309dda
2 changed files with 16 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

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

59
hosts/toaster/network/default.nix
View file

@ -1,4 +1,4 @@
{ lib, pkgs, ... }: { lib, config, ... }:
{ {
imports = [ imports = [
./mullvad.nix ./mullvad.nix
@ -6,21 +6,26 @@
./zw.nix ./zw.nix
]; ];
environment.systemPackages = with pkgs; [ # Networkmanager shouldn't interfere with systemd managed interfaces
iwgtk networking.networkmanager.unmanaged =
impala let
]; systemd_netdevs = lib.attrsets.attrValues (
lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs
);
in
systemd_netdevs;
# kick out networkmanager systemd.network = {
networking.networkmanager.enable = lib.mkForce false; enable = true;
networking.useNetworkd = true; wait-online.enable = false; # uplink is managed by networkmanager
systemd.network.enable = true; };
users.users."0xa".extraGroups = [ "networkmanager" ];
networking = { networking = {
hostName = "toaster"; hostName = "toaster";
firewall.enable = true; firewall.enable = true;
wireguard.enable = true; wireguard.enable = true;
wireless.iwd.enable = true;
}; };
services.resolved = { services.resolved = {
@ -34,38 +39,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;
};
};
};
} }