redo pipewire module

Signed-off-by: unexplrd <unexplrd@linerds.us>

hosts/sarien/boot.nix

@@ -11,6 +11,21 @@
     # kernelPackages = pkgs.linuxPackages_latest;
     kernelPackages = pkgs.linuxPackages_cachyos;
     kernelModules = ["kvm-intel"];
+    kernelParams = [
+      "debugfs=off"
+      "efi=disable_early_pci_dma"
+      # "gather_data_sampling=force"
+      "intel_iommu=on"
+      "iommu.passthrough=0"
+      "iommu.strict=1"
+      "iommu=force"
+      # "lockdown=confidentiality"
+      # "module.sig_enforce=1"
+      "page_alloc.shuffle=1"
+      # "reg_file_data_sampling=on"
+      # "spec_rstack_overflow=safe-ret"
+      "vsyscall=none"
+    ];
     loader.efi.canTouchEfiVariables = true;
     loader.systemd-boot = {
       enable = true;

modules/home/desktop/niri/default.nix

@@ -8,7 +8,8 @@
   cfg = config.desktop.niri;
   inherit (osConfig.networking) hostId;
   inherit (config.lib.stylix) colors;
-  cursor_size = config.stylix.cursor.size;
+  cursorSize = config.stylix.cursor.size;
+  cursorName = config.stylix.cursor.name;
   keyboard =
     if hostId == "eldrid"
     then "chromeos"
@@ -425,8 +426,8 @@ in {
           }
 
           cursor {
-            xcursor-theme "${config.stylix.cursor.name}"
+            xcursor-theme "${cursorName}"
-            xcursor-size ${toString cursor_size}
+            xcursor-size ${toString cursorSize}
           }
 
           layout {

modules/home/desktop/plasma/default.nix

@@ -12,7 +12,6 @@ in {
       mkEnableOption "enable plasma desktop";
   };
   config = mkIf cfg.enable {
-    stylix.targets.kde.enable = true;
     home.packages = with pkgs; [
       wl-clipboard-rs
     ];

modules/nixos/desktop/common/pipewire.nix

@@ -1,21 +1,59 @@
 {
-  config,
   lib,
+  config,
   ...
-}: {
+}: let
-  security.rtkit.enable = lib.mkDefault config.services.pipewire.enable;
+  inherit (lib) mkEnableOption mkIf;
-  services = {
+
-    pulseaudio.enable = false;
+  cfg = config.sound.pipewire;
-    pipewire = {
+in {
+  options = {
+    sound.pipewire.enable = mkEnableOption "enable pipewire";
+  };
+
+  config = mkIf cfg.enable {
+    security.rtkit.enable = true;
+    services.pulseaudio.enable = false;
+    services.pipewire = {
       enable = true;
       alsa.enable = true;
       pulse.enable = true;
-      extraConfig.pipewire."92-low-latency" = {
+
-        context.properties.default.clock = {
+      extraConfig = {
-          rate = 48000;
+        pipewire = {
-          quantum = 32;
+          "92-low-latency" = {
-          min-quantum = 32;
+            "context.properties" = {
-          max-quantum = 32;
+              "default.clock.rate" = 48000;
+              "default.clock.allowed-rates" = [
+                44100
+                48000
+                88200
+                96000
+              ];
+
+              "default.clock.min-quantum" = 512;
+              "default.clock.quantum" = 4096;
+              "default.clock.max-quantum" = 8192;
+            };
+          };
+
+          "93-no-resampling" = {
+            "context.properties" = {
+              "default.clock.rate" = 48000;
+              "default.clock.allowed-rates" = [
+                44100
+                48000
+                96000
+                192000
+              ];
+            };
+          };
+
+          "94-no-upmixing" = {
+            "stream.properties" = {
+              "channelmix.upmix" = false;
+            };
+          };
         };
       };
     };

modules/nixos/desktop/cosmic.nix

@@ -8,7 +8,6 @@
   cfg = config.desktop.cosmic;
 in {
   imports = with inputs; [
-    ./common/pipewire.nix
     nixos-cosmic.nixosModules.default
   ];
   options = {
@@ -16,6 +15,7 @@ in {
       lib.mkEnableOption "enable cosmic desktop";
   };
   config = lib.mkIf cfg.enable {
+    sound.pipewire.enable = true;
     nix.settings = {
       substituters = ["https://cosmic.cachix.org/"];
       trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];

modules/nixos/desktop/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./common/pipewire.nix
     # ./cosmic.nix
     ./gnome.nix
     ./hyprland.nix

modules/nixos/desktop/gnome.nix

@@ -1,18 +1,17 @@
 {
   config,
-  pkgs,
   lib,
   ...
 }:
 with lib; let
   cfg = config.desktop.gnome;
 in {
-  imports = [./common/pipewire.nix];
   options = {
     desktop.gnome.enable =
       mkEnableOption "enable gnome desktop";
   };
   config = mkIf cfg.enable {
+    sound.pipewire.enable = true;
     services.xserver = {
       enable = true;
       displayManager.gdm.enable = true;

modules/nixos/desktop/hyprland.nix

@@ -8,12 +8,12 @@
 with lib; let
   cfg = config.desktop.hyprland;
 in {
-  imports = [./common/pipewire.nix];
   options = {
     desktop.hyprland.enable =
       mkEnableOption "enable hyprland desktop";
   };
   config = mkIf cfg.enable {
+    sound.pipewire.enable = true;
     programs.hyprland = {
       enable = true;
       package = perSystem.hyprland.hyprland;

modules/nixos/desktop/niri.nix

@@ -7,12 +7,12 @@
 with lib; let
   cfg = config.desktop.niri;
 in {
-  imports = [./common/pipewire.nix];
   options = {
     desktop.niri.enable =
       mkEnableOption "enable niri desktop";
   };
   config = mkIf cfg.enable {
+    sound.pipewire.enable = true;
     programs.niri.enable = true;
     environment.systemPackages = with pkgs; [
       brightnessctl