options/custom/scripts/nixos.sh

@@ -37,7 +37,7 @@ _build() {
 
   # Build and send closures to remote machine
   if [[ "${argc_target:-}" ]]; then
-    nixos-rebuild --flake ".#${argc_target}" --target-host "root@${argc_target}" "$1" --show-trace ${argc_extra:+"${argc_extra[@]}"}
+    nixos-rebuild --flake ".#${argc_target}" --target-host "root@${argc_target}" "$1" -- --show-trace ${argc_extra:+"${argc_extra[@]}"}
   else
     # Build current system
     if [[ "${argc_builder:-}" == nh ]]; then

options/custom/services/pipewire.nix

@@ -9,15 +9,13 @@ in {
   options.custom.services.pipewire.enable = mkOption {default = false;};
 
   config = mkIf cfg.enable {
-    #!! Realtime priority may cause desync
-    #// security.rtkit.enable = true;
-
-    services = {
-      pulseaudio.enable = false;
-
     # https://wiki.nixos.org/wiki/PipeWire
     # https://gitlab.freedesktop.org/pipewire/pipewire
-      pipewire = {
+    #!! Realtime priority may cause desync
+    #// security.rtkit.enable = true;
+    hardware.pulseaudio.enable = false;
+
+    services.pipewire = {
       enable = true;
       alsa.enable = true;
       alsa.support32Bit = true;
@@ -38,5 +36,4 @@ in {
       };
     };
   };
-  };
 }