Merge remote-tracking branch 'origin/master' into staging-next

nixos/modules/programs/wayland/uwsm.nix

@@ -116,14 +116,17 @@ in
       {
         environment.systemPackages = [ cfg.package ];
         systemd.packages = [ cfg.package ];
-        environment.pathsToLink = [ "/share/uwsm" ];
+        environment.pathsToLink = [
+          "/share/uwsm"
+          "/share/wayland-sessions"
+        ];
 
         # UWSM recommends dbus broker for better compatibility
         services.dbus.implementation = "broker";
       }
 
       (lib.mkIf (cfg.waylandCompositors != { }) {
-        services.displayManager.sessionPackages = lib.mapAttrsToList (
+        environment.systemPackages = lib.mapAttrsToList (
           name: value:
           mk_uwsm_desktop_entry {
             inherit name;

pkgs/by-name/pr/proton-ge-bin/package.nix

@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton10-29";
+  version = "GE-Proton10-30";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-ATtKLEKA+r557FVnBoW/iYrRR4Ki9G8rjlV4+2rki0I=";
+    hash = "sha256-YZ+v+dzO70qTs3JxOAk9n7ByIYb3r8SeJBWnzjKQwuQ=";
   };
 
   dontUnpack = true;