Revert "[spotifyd] Update to lean in on pulseaudio"

This reverts commit b9097e91d5.

home/modules/plasma-manager/default.nix

@@ -89,24 +89,26 @@
         "PoloniumSwitchThreeColumn" = [ ];
 
         "Show Desktop" = "Meta+D";
-        "Switch to Desktop 1" = "Meta+1,,Switch to Desktop 1";
+        "Switch to Desktop 1" = "Meta+1,none,Switch to Desktop 1";
-        "Switch to Desktop 2" = "Meta+2,,Switch to Desktop 2";
+        "Switch to Desktop 2" = "Meta+2,none,Switch to Desktop 2";
-        "Switch to Desktop 3" = "Meta+3,,Switch to Desktop 3";
+        "Switch to Desktop 3" = "Meta+3,none,Switch to Desktop 3";
-        "Switch to Desktop 4" = "Meta+4,,Switch to Desktop 4";
+        "Switch to Desktop 4" = "Meta+4,none,Switch to Desktop 4";
-        "Switch to Desktop 5" = "Meta+5,,Switch to Desktop 5";
+        "Switch to Desktop 5" = "Meta+5,none,Switch to Desktop 5";
-        "Switch to Desktop 6" = "none,,Switch to Desktop 6";
+        "Switch to Desktop 6" = "Meta+6,none,Switch to Desktop 6";
-        "Switch to Desktop 7" = "none,,Switch to Desktop 7";
+        "Switch to Desktop 7" = "Meta+7,none,Switch to Desktop 7";
-        "Switch to Desktop 8" = "none,,Switch to Desktop 8";
+        "Switch to Desktop 8" = "Meta+8,none,Switch to Desktop 8";
-        "Switch to Desktop 9" = "none,,Switch to Desktop 9";
+        "Switch to Desktop 9" = "Meta+9,none,Switch to Desktop 9";
-        "Window to Desktop 1" = "Meta+!,,Window to Desktop 1";
+        "Switch to Desktop 10" = "Meta+10,none,Switch to Desktop 9";
-        "Window to Desktop 2" = "Meta+@,,Window to Desktop 2";
+        "Window to Desktop 1" = "Meta+!,none,Window to Desktop 1";
-        "Window to Desktop 3" = "Meta+#,,Window to Desktop 3";
+        "Window to Desktop 2" = "Meta+@,none,Window to Desktop 2";
-        "Window to Desktop 4" = "Meta+$,,Window to Desktop 4";
+        "Window to Desktop 3" = "Meta+#,none,Window to Desktop 3";
-        "Window to Desktop 5" = "Meta+%,,Window to Desktop 5";
+        "Window to Desktop 4" = "Meta+$,none,Window to Desktop 4";
-        "Window to Desktop 6" = "none,,Window to Desktop 6";
+        "Window to Desktop 5" = "Meta+%,none,Window to Desktop 5";
-        "Window to Desktop 7" = "none,,Window to Desktop 7";
+        "Window to Desktop 6" = "Meta+^,none,Window to Desktop 6";
-        "Window to Desktop 8" = "none,,Window to Desktop 8";
+        "Window to Desktop 7" = "Meta+&,none,Window to Desktop 7";
-        "Window to Desktop 9" = "none,,Window to Desktop 9";
+        "Window to Desktop 8" = "Meta+*,none,Window to Desktop 8";
+        "Window to Desktop 9" = "Meta+(,none,Window to Desktop 9";
+        "Window to Desktop 10" = "Meta+),none,Window to Desktop 10";
 
         "Walk Through Windows" = "Alt+Tab";
         "Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
@@ -155,7 +157,7 @@
 
     configFile = {
       kwinrc.Desktops.Number = {
-        value = 9;
+        value = 10;
         immutable = true;
       };
     };

machines/boxy/configuration.nix

@@ -19,10 +19,6 @@ with lib;
       autologin = true;
       wayland = true;
     };
-    spotifyd = {
-      enable = true;
-      deviceType = "t_v";
-    };
     users.enable = true;
   };
 

roles/audio/default.nix

@@ -13,15 +13,16 @@ in
   config = mkIf cfg.enable
     {
       environment.systemPackages = with pkgs; [
-        alsa-utils
         paprefs
         pavucontrol
         pulsemixer
       ];
 
-      hardware.pulseaudio.enable = true;
+      services.pipewire = {
+        enable = true;
+        pulse.enable = true;
+      };
       hardware.pulseaudio.package = pkgs.pulseaudioFull;
-      hardware.pulseaudio.support32Bit = true;
       hardware.pulseaudio.extraConfig = "
         load-module module-combine-sink
         load-module module-switch-on-connect

roles/kodi/default.nix

@@ -38,18 +38,7 @@ in
         (mkIf cfg.wayland {
           cage = mkIf cfg.wayland {
             user = "kodi";
-            #program = "gamescope -f --hdr-enabled ${kodiPkg}/bin/kodi-standalone";
+            program = "${kodiPkg}/bin/kodi-standalone";
-	    program =
-	      let
-	        kodiGamescope = pkgs.writeShellApplication {
-		  name = "kodi-gamescope";
-		  runtimeInputs = [ kodiPkg pkgs.gamescope ];
-		  text = ''
-		    ${pkgs.gamescope}/bin/gamescope --hdr-enabled -f -- ${kodiPkg}/bin/kodi-standalone
-		  '';
-		};
-	      in
-	      "${lib.getExe kodiGamescope}";
             enable = true;
           };
           xserver = {

roles/spotifyd/default.nix

@@ -8,38 +8,29 @@ in
 {
   options.roles.spotifyd = {
     enable = mkEnableOption "Enable the spotifyd role";
-    deviceType = mkOption {
-      default = "computer";
-    };
   };
 
   config = mkIf cfg.enable
     {
       roles.audio.enable = true;
-      hardware.pulseaudio.enable = true;
-      hardware.pulseaudio.extraConfig = ''
-        unload-module module-native-protocol-unix
-        load-module module-native-protocol-unix auth-anonymous=1
-      '';
-      hardware.pulseaudio.systemWide = true;
 
       services.spotifyd = {
         enable = true;
         settings = {
           global = {
             use_mpris = false;
-            backend = "pulseaudio";
+            backend = "alsa";
+            device = "sysdefault";
             bitrate = 320;
             cache_path = "";
-            zeroconf_port = 5354;
+            zeroconf_port = 1234;
             autoplay = false;
-            device_type = cfg.deviceType;
           };
         };
       };
 
       networking.firewall.allowedTCPPorts = [
-        5354
+        1234
         57621
       ];
       networking.firewall.allowedUDPPorts = [