common/pc/audio.nix

@@ -4,59 +4,26 @@ let
   cfg = config.de;
 in {
   config = lib.mkIf cfg.enable {
+    # Audio
+    sound.enable = true;
+
     # enable pulseaudio support for packages
     nixpkgs.config.pulseaudio = true;
 
-    # realtime audio
+    # realtime pulseaudio
     security.rtkit.enable = true;
 
-    services.pipewire = {
+    hardware.pulseaudio = {
       enable = true;
-      alsa.enable = true;
+      support32Bit = true;
-      alsa.support32Bit = true;
+      package = pkgs.pulseaudioFull; # bt headset support
-      pulse.enable = true;
-      jack.enable = true;
 
-      # use the example session manager (no others are packaged yet so this is enabled by default,
+      # TODO: switch on connect isn't working for some reason (at least when in kde)
-      # no need to redefine it in your config for now)
+      extraConfig = "
-      #media-session.enable = true;
+        load-module module-switch-on-connect
-
+        load-module module-switch-on-connect ignore_virtual=no
-      config.pipewire = {
+      ";
-        "context.objects" = [
-          {
-            # A default dummy driver. This handles nodes marked with the "node.always-driver"
-            # properyty when no other driver is currently active. JACK clients need this.
-            factory = "spa-node-factory";
-            args = {
-              "factory.name"     = "support.node.driver";
-              "node.name"        = "Dummy-Driver";
-              "priority.driver"  = 8000;
-            };
-          }
-          {
-            factory = "adapter";
-            args = {
-              "factory.name"     = "support.null-audio-sink";
-              "node.name"        = "Microphone-Proxy";
-              "node.description" = "Microphone";
-              "media.class"      = "Audio/Source/Virtual";
-              "audio.position"   = "MONO";
-            };
-          }
-          {
-            factory = "adapter";
-            args = {
-              "factory.name"     = "support.null-audio-sink";
-              "node.name"        = "Main-Output-Proxy";
-              "node.description" = "Main Output";
-              "media.class"      = "Audio/Sink";
-              "audio.position"   = "FL,FR";
-            };
-          }
-        ];
-      };
     };
-
     users.users.googlebot.extraGroups = [ "audio" ];
 
     # bt headset support

common/pc/de.nix

@@ -30,7 +30,6 @@ in {
     # Applications
     users.users.googlebot.packages = with pkgs; [
       chromium keepassxc mumble tigervnc bluez-tools vscodium element-desktop mpv
-      nextcloud-client signal-desktop minecraft sauerbraten
     ];
 
     # Networking

machines/ray/hardware-configuration.nix

@@ -26,7 +26,7 @@
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/4CD3-6ED6";
+    { device = "/dev/disk/by-uuid/8C47-F740";
       fsType = "vfat";
     };