From 15e6d3bfa4643fea6521f55563d349558e33dca9 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 16 Jan 2021 20:51:47 +0100
Subject: Extract wireless setup fvrom connman.nix to iwd.nix

---
 system/settings/hardware/connman.nix | 1 -
 system/settings/hardware/iwd.nix     | 9 +++++++++
 system/settings/hardware/laptop.nix  | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 system/settings/hardware/iwd.nix

diff --git a/system/settings/hardware/connman.nix b/system/settings/hardware/connman.nix
index 8604cb06..779f8b7a 100644
--- a/system/settings/hardware/connman.nix
+++ b/system/settings/hardware/connman.nix
@@ -4,7 +4,6 @@
     enable = true;
     enableVPN = false;
   };
-  networking.wireless.enable = true;
 
   environment.systemPackages = with pkgs; [
     connman-gtk
diff --git a/system/settings/hardware/iwd.nix b/system/settings/hardware/iwd.nix
new file mode 100644
index 00000000..560c6694
--- /dev/null
+++ b/system/settings/hardware/iwd.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  networking.wireless.iwd = {
+    enable = true;
+  };
+
+  services.connman.wifi.backend = "iwd";
+}
diff --git a/system/settings/hardware/laptop.nix b/system/settings/hardware/laptop.nix
index 0dea0384..9f752070 100644
--- a/system/settings/hardware/laptop.nix
+++ b/system/settings/hardware/laptop.nix
@@ -4,6 +4,8 @@
   imports = [
     ./bluetooth.nix
     ./bluetooth-audio.nix
+    ./connman.nix
+    ./iwd.nix
     ../user-interface.nix
   ];
 
-- 
cgit 1.4.1