Various GUI fixes

home-manager/modules/gui/default.nix

@@ -260,6 +260,11 @@ in
               emoji-mode = "copy";
             };
           };
+          swaylock = {
+            enable = true;
+            # need to use system swaylock for PAM reasons
+            package = pkgs.runCommandWith { name = "swaylock-dummy"; } ''mkdir $out'';
+          };
 
           chromium = {
             enable = true;

nixos/boxes/castle/default.nix

@@ -177,7 +177,10 @@
               };
 
               my = {
-                gui.standalone = true;
+                gui = {
+                  standalone = true;
+                  manageGraphical = true;
+                };
               };
             };
           };

nixos/boxes/tower/default.nix

@@ -181,7 +181,10 @@
               };
 
               my = {
-                gui.standalone = true;
+                gui = {
+                  standalone = true;
+                  manageGraphical = true;
+                };
               };
             };
           };

nixos/modules/gui.nix

@@ -21,11 +21,15 @@ in
       ];
     };
 
-    security.polkit.enable = true;
+    security = {
+      polkit.enable = true;
+      pam.services.swaylock = {};
+    };
 
     environment.systemPackages = with pkgs; [
       # for pw-jack
       pipewire.jack
+      swaylock
     ];
     services = {
       pipewire = {
@@ -62,21 +66,6 @@ in
       noto-fonts-emoji
     ];
 
-    nixpkgs.overlays = [
-      (self: super: {
-        xdg-desktop-portal = super.xdg-desktop-portal.overrideAttrs (old: rec {
-          # https://github.com/flatpak/xdg-desktop-portal/issues/861
-          version = "1.14.6";
-
-          src = pkgs.fetchFromGitHub {
-            owner = "flatpak";
-            repo = old.pname;
-            rev = version;
-            sha256 = "sha256-MD1zjKDWwvVTui0nYPgvVjX48DaHWcP7Q10vDrNKYz0=";
-          };
-        });
-      })
-    ];
     xdg = {
       portal = {
         enable = true;