diff --git a/roles/desktop/configuration.nix b/roles/desktop/configuration.nix index ab3242a..3a10fee 100644 --- a/roles/desktop/configuration.nix +++ b/roles/desktop/configuration.nix @@ -8,6 +8,8 @@ }; users.users.toast.extraGroups = [ "scanner" ]; + networking.networkmanager.enable = true; + services.xserver.enable = true; # Set up fonts diff --git a/roles/desktop/services/default.nix b/roles/desktop/services/default.nix index c746c38..d2031da 100644 --- a/roles/desktop/services/default.nix +++ b/roles/desktop/services/default.nix @@ -7,6 +7,5 @@ ./syncthing.nix ./pipewire.nix ./printing.nix - ./networkmanager.nix ]; } diff --git a/roles/desktop/services/networkmanager.nix b/roles/desktop/services/networkmanager.nix deleted file mode 100644 index 7a64922..0000000 --- a/roles/desktop/services/networkmanager.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, ... }: - -let - tailscaleName = config.services.tailscale.interfaceName; -in - -{ - networking.networkmanager = { - enable = true; - unmanaged = [ - "interface-name:${tailscaleName}" - ]; - wifi.macAddress = "random"; - }; -}