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

This reverts commit b9097e91d5.

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728041527,
+        "lastModified": 1729459288,
-        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
+        "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
+        "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727802920,
+        "lastModified": 1729256560,
-        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
+        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
+        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1725762081,
+        "lastModified": 1729357638,
-        "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
+        "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
+        "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728750492,
+        "lastModified": 1729372184,
-        "narHash": "sha256-9IHlIsH4gLqQjS2lFbEnsl/ItdqzBBLWLsyXS0k0jf8=",
+        "narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "c6d4b6f3e0138c08f37d66fcfbcbe37dab08f108",
+        "rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1727423009,
+        "lastModified": 1729394972,
-        "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=",
+        "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "127a96f49ddc377be6ba76964411bab11ae27803",
+        "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
         "type": "github"
       },
       "original": {

home/modules/plasma-manager/default.nix

@@ -24,7 +24,7 @@
 
     hotkeys.commands."launch-konsole" = {
       name = "Launch Konsole";
-      key = "Meta+Enter";
+      key = "Meta+Return";
       command = "konsole";
     };
 
@@ -52,7 +52,7 @@
       };
 
       ksmserver = {
-        "Lock Session" = ["Meta+Ctrl+Q" "Screensaver,Meta+L" "Screensaver,Lock Session"];
+        "Lock Session" = ["Meta+Ctrl+Q" "Screensaver" "Screensaver,Lock Session"];
       };
 
       kwin = {
@@ -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";
@@ -137,12 +139,25 @@
       "org_kde_powerdevil"."Turn Off Screen" = [ ];
       "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"];
 
-      "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"];
+      plasmashell = {
+        "activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"];
+        "activate task manager entry 1" = "none,,";
+        "activate task manager entry 2" = "none,,";
+        "activate task manager entry 3" = "none,,";
+        "activate task manager entry 4" = "none,,";
+        "activate task manager entry 5" = "none,,";
+        "activate task manager entry 6" = "none,,";
+        "activate task manager entry 7" = "none,,";
+        "activate task manager entry 8" = "none,,";
+        "activate task manager entry 9" = "none,,";
+        "activate task manager entry 10" = "none,,";
+        "show activity switcher" = "none,,";
+      };
     };
 
     configFile = {
       kwinrc.Desktops.Number = {
-        value = 9;
+        value = 10;
         immutable = true;
       };
     };

machines/z790prors/hardware-configuration.nix

@@ -33,6 +33,18 @@
     open = false;
     nvidiaSettings = true;
     package = config.boot.kernelPackages.nvidiaPackages.production;
+    #package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      #version = "555.58";
+
+      #sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew=";
+      #sha256_aarch64 = lib.fakeSha256;
+      #openSha256 = lib.fakeSha256;
+      #settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M=";
+      #persistencedSha256 = lib.fakeSha256;
+    #};
+  };
+  environment.sessionVariables = {
+    KWIN_DRM_ALLOW_NVIDIA_COLORSPACE = "1";
   };
 
   fileSystems."/" =

roles/default.nix

@@ -59,6 +59,12 @@ with lib;
           "https://hyprland.cachix.org"
         ];
       };
+
+      gc = {
+        automatic = true;
+        randomizedDelaySec = "14m";
+        options = "--delete-older-than 10d";
+      };
     };
 
     nixpkgs.config.allowUnfree = true;