nvm suspend is borked

default.nix

@@ -24,7 +24,7 @@ in {
 
   boot = {
     kernelPackages = mkDefault pkgs.linuxPackages_latest;
-    kernelParams = [ "pci_aspm.policy=performance" ];
+    kernelParams = [ "pcie_aspm.policy=performance" ];
   };
 
   # configure keymap in x11

hosts/flubber-machine/hardware.nix

@@ -3,7 +3,6 @@
 {
   imports =
     [
-      inputs.hardware.nixosModules.gigabyte-b550
       inputs.hardware.nixosModules.common-cpu-amd
       inputs.hardware.nixosModules.common-gpu-amd
       inputs.hardware.nixosModules.common-pc-ssd

hosts/flubber-machine/omen-30l-gt13-1xxx.nix

@@ -11,9 +11,8 @@
 
   environment.systemPackages = with pkgs; [ amdgpu_top ];
 
-  # fix audio issues
-  # Is this even needed. I'm losing my mindddddd
-  # https://forums.linuxmint.com/viewtopic.php?t=445461
-  # https://help.ubuntu.com/community/HdaIntelSoundHowto
-  boot.extraModprobeConfig = ''options snd_hda_intel model=generic'';
+  # fix audio issues: https://forums.linuxmint.com/viewtopic.php?t=445461
+  boot.extraModprobeConfig = ''
+    options snd_hda_intel model=generic
+  '';
 }

modules/security.nix

@@ -8,7 +8,8 @@ in {
     useDoas = mkEnableOption "use opendoas instead of sudo";
   };
 
-  config = mkIf cfg.enable {
+  config = mkMerge [
+    {
       boot = {
         tmp.useTmpfs = lib.mkDefault true;
         tmp.cleanOnBoot = lib.mkDefault (!config.boot.tmp.useTmpfs);
@@ -45,7 +46,7 @@ in {
           # TCP fastopen
           "net.ipv4.tcp_fastopen" = 3;
           # bufferbloat mitigations + improvement in throughput and latency
-        "net.ipv4.tcp_conjestion_control" = "bbr";
+          "net.ipv4.tcp_congestion_control" = "bbr";
           "net.core.default_qdisc" = "cake";
         };
         kernelModules = [ "tcp_bbr" ];
@@ -78,12 +79,14 @@ in {
       };
 
       services.fwupd.enable = true;
-  } // (mkIf cfg.useDoas {
+    }
+    (mkIf cfg.useDoas {
       security.sudo.enable = false;
       security.doas.enable = true;
       security.doas.extraRules = [
         { users = [ config.user.name ]; noPass = true; persist = false; keepEnv = true; }
       ];
       environment.systemPackages = with pkgs; [ doas-sudo-shim ];
-  });
+    })
+  ];
 }