Switch back to wpa_supplicant, lots of tweaks and simplifications

hosts/envy/default.nix

@@ -12,7 +12,7 @@
 
   networking = {
     hostName = "envy";
-    wireless.iwd.enable = true;
+    wireless.enable = true;
     wg-quick.interfaces.wgc.address = [ "10.100.0.25/24" ];
   };
 

hosts/intuos/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ ... }:
 {
   imports = [
     ./boot
@@ -11,14 +11,15 @@
 
   networking = {
     hostName = "intuos";
-    wireless.iwd.enable = true;
-    interfaces."wlan0".ipv4.addresses = [{
+    useDHCP = false;
+    wireless.enable = true;
+    interfaces."wlp1s0".ipv4.addresses = [{
       address = "10.2.0.102";
       prefixLength = 8;
     }];
     defaultGateway = {
       address = "10.1.0.1";
-      interface = "wlan0";
+      interface = "wlp1s0";
     };
   };
 

hosts/pear/default.nix

@@ -12,7 +12,7 @@
 
   networking = {
     hostName = "pear";
-    wireless.iwd.enable = true;
+    wireless.enable = true;
     wg-quick.interfaces.wgc.address = [ "10.100.0.18/24" ];
   };
 

hosts/redmond/default.nix

@@ -11,7 +11,7 @@
 
   networking = {
     hostName = "redmond";
-    wireless.iwd.enable = true;
+    wireless.enable = true;
     wg-quick.interfaces.wgc.address = [ "10.100.0.23/24" ];
   };
 

modules/system/devices/audio/default.nix

@@ -1,22 +1,13 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 {
-  config = lib.mkIf config.system.desktop.enable {
-    services.pipewire = {
+  services.pipewire = {
+    enable = config.system.desktop.enable;
+    wireplumber.extraConfig."wireplumber.settings"."bluetooth.autoswitch-to-headset-profile" = false;
+    alsa = {
       enable = true;
-      wireplumber = {
-        enable = true;
-        configPackages = [
-          (pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/11-bluetooth-policy.conf" ''
-            wireplumber.settings = { bluetooth.autoswitch-to-headset-profile = false }
-          '')
-        ];
-      };
-      alsa = {
-        enable = true;
-        support32Bit = true;
-      };
-      pulse.enable = true;
-      #jack.enable = true;
+      support32Bit = true;
     };
+    pulse.enable = true;
+    #jack.enable = true;
   };
 }

modules/system/devices/boot/default.nix

@@ -1,7 +1,6 @@
 { ... }:
 {
   imports = [
-    ./extlinux
     ./grub
     ./lanzaboote
     ./plymouth

modules/system/devices/boot/extlinux/default.nix

@@ -1,10 +0,0 @@
-{ config, lib, ... }:
-{
-  options.system.extlinux.enable = lib.mkEnableOption "Enable extlinux";
-
-  config.boot.loader = lib.mkIf config.system.extlinux.enable {
-    grub.enable = false;
-    systemd-boot.enable = lib.mkForce false;
-    generic-extlinux-compatible.enable = true;
-  };
-}

modules/system/devices/boot/grub/default.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
 {
-  boot.loader = lib.mkIf config.boot.loader.grub.enable {
+  boot.loader = {
     grub = {
       efiSupport = true;
       efiInstallAsRemovable = true;

modules/system/devices/boot/lanzaboote/default.nix

@@ -2,9 +2,6 @@
 {
   imports = [ lanzaboote.nixosModules.lanzaboote ];
 
-  boot = lib.mkIf config.boot.lanzaboote.enable {
-    lanzaboote.pkiBundle = "/etc/secureboot";
-  };
-
+  boot.lanzaboote.pkiBundle = "/etc/secureboot";
   environment.systemPackages = with pkgs; [ sbctl ];
 }

modules/system/devices/boot/systemd/default.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
 {
-  boot.loader.systemd-boot = lib.mkIf config.boot.loader.systemd-boot.enable {
+  boot.loader.systemd-boot = {
     editor = false;
     graceful = true;
   };

modules/system/devices/networking/default.nix

@@ -1,11 +1,12 @@
 { config, ... }:
 {
+  imports = [ ./networks ];
+
   networking = {
-    wireless.enable = false;
-    dhcpcd.enable = true;
+    useNetworkd = true;
+    dhcpcd.enable = false;
     nftables.enable = true;
     firewall.allowPing = false;
-    useNetworkd = true;
     nameservers = [
       "1.1.1.1#one.one.one.one"
       "1.0.0.1#one.one.one.one"

modules/system/devices/networking/networks/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  networking.wireless.networks = {
+    "JimRouter".pskRaw = "074c4aa88823219bbf0dd02d002e1780035c017e4fe579336c7435236ab5b76a";
+    "JimRouter_5G".pskRaw = "5156b4c53e87eeab7ad2bad7539db5eff2ffa1b1c3e029c941497f8aa89b0a34";
+    "BELL853".pskRaw = "8592380486aa824faf7ffa9dfa36135df6c22eeb48ef7a10f834ce437c742ab0";
+  };
+}

modules/system/services/general/default.nix

@@ -5,7 +5,6 @@
     ./earlyoom
     ./gnome-keyring
     ./gvfs
-    ./iwd
     ./keyd
     ./libvirtd
     ./portals

modules/system/services/general/iwd/default.nix

@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  environment = lib.mkIf config.networking.wireless.iwd.enable {
-    systemPackages = with pkgs; [ impala ];
-    persistence."/persist".directories = [ "/var/lib/iwd/" ];
-  };
-}

modules/system/services/server/nginx/rtmp/default.nix

@@ -2,9 +2,7 @@
 {
   config = lib.mkIf config.services.webserver.enable {
     services.nginx = {
-      package = pkgs.nginx.override {
-        modules = with pkgs.nginxModules; [ rtmp ];
-      };
+      additionalModules = with pkgs.nginxModules; [ rtmp ];
       appendConfig = ''
         rtmp {
           server {