From 90d45024dbd8a46dfd5a66491d0db2ef4cf81a88 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Wed, 21 Feb 2024 13:43:15 +0100
Subject: [PATCH 1/3] Desktop: configure NetworkManager in a separate file

---
 roles/desktop/configuration.nix           | 2 --
 roles/desktop/services/default.nix        | 1 +
 roles/desktop/services/networkmanager.nix | 7 +++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 roles/desktop/services/networkmanager.nix

diff --git a/roles/desktop/configuration.nix b/roles/desktop/configuration.nix
index 3a10fee..ab3242a 100644
--- a/roles/desktop/configuration.nix
+++ b/roles/desktop/configuration.nix
@@ -8,8 +8,6 @@
 	};
 	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 d2031da..c746c38 100644
--- a/roles/desktop/services/default.nix
+++ b/roles/desktop/services/default.nix
@@ -7,5 +7,6 @@
 		./syncthing.nix
 		./pipewire.nix
 		./printing.nix
+		./networkmanager.nix
 	];
 }
diff --git a/roles/desktop/services/networkmanager.nix b/roles/desktop/services/networkmanager.nix
new file mode 100644
index 0000000..fd91b03
--- /dev/null
+++ b/roles/desktop/services/networkmanager.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  networking.networkmanager = {
+    enable = true;
+  };
+}

From d90a2676185a927f8cd851b46607487ec237441c Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Wed, 21 Feb 2024 13:55:42 +0100
Subject: [PATCH 2/3] Desktop/NetworkManager: don't manage tailscale's
 interface

---
 roles/desktop/services/networkmanager.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/roles/desktop/services/networkmanager.nix b/roles/desktop/services/networkmanager.nix
index fd91b03..54d4b08 100644
--- a/roles/desktop/services/networkmanager.nix
+++ b/roles/desktop/services/networkmanager.nix
@@ -1,7 +1,14 @@
-{ ... }:
+{ config, ... }:
+
+let
+  tailscaleName = config.services.tailscale.interfaceName;
+in
 
 {
   networking.networkmanager = {
     enable = true;
+    unmanaged = [
+      "interface-name:${tailscaleName}"
+    ];
   };
 }

From cb748fedaa19240543864430ec5329af2eabae57 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Wed, 21 Feb 2024 14:09:35 +0100
Subject: [PATCH 3/3] Desktop/NetworkManager: enable wifi mac address
 randomisation

---
 roles/desktop/services/networkmanager.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/desktop/services/networkmanager.nix b/roles/desktop/services/networkmanager.nix
index 54d4b08..7a64922 100644
--- a/roles/desktop/services/networkmanager.nix
+++ b/roles/desktop/services/networkmanager.nix
@@ -10,5 +10,6 @@ in
     unmanaged = [
       "interface-name:${tailscaleName}"
     ];
+    wifi.macAddress = "random";
   };
 }