From 3286cc0bcba36cff043bbc8f5b66aebd199aa387 Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Sun, 27 Aug 2023 20:04:53 +0100
Subject: [PATCH] Various GUI fixes

---
 home-manager/modules/gui/default.nix |  5 +++++
 nixos/boxes/castle/default.nix       |  5 ++++-
 nixos/boxes/tower/default.nix        |  5 ++++-
 nixos/modules/gui.nix                | 21 +++++----------------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/home-manager/modules/gui/default.nix b/home-manager/modules/gui/default.nix
index 5368a38..a0a1b07 100644
--- a/home-manager/modules/gui/default.nix
+++ b/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;
diff --git a/nixos/boxes/castle/default.nix b/nixos/boxes/castle/default.nix
index 0473b58..da87c31 100644
--- a/nixos/boxes/castle/default.nix
+++ b/nixos/boxes/castle/default.nix
@@ -177,7 +177,10 @@
               };
 
               my = {
-                gui.standalone = true;
+                gui = {
+                  standalone = true;
+                  manageGraphical = true;
+                };
               };
             };
           };
diff --git a/nixos/boxes/tower/default.nix b/nixos/boxes/tower/default.nix
index 0694b7c..447cc12 100644
--- a/nixos/boxes/tower/default.nix
+++ b/nixos/boxes/tower/default.nix
@@ -181,7 +181,10 @@
               };
 
               my = {
-                gui.standalone = true;
+                gui = {
+                  standalone = true;
+                  manageGraphical = true;
+                };
               };
             };
           };
diff --git a/nixos/modules/gui.nix b/nixos/modules/gui.nix
index 9e52784..6ef6790 100644
--- a/nixos/modules/gui.nix
+++ b/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;