From 3d11b838993154cfbbe7dee7bda74bf519f516f8 Mon Sep 17 00:00:00 2001
From: Nico <nico@astolfo.org>
Date: Thu, 29 May 2025 22:56:36 +1000
Subject: [PATCH] desktop: move polkit and xdg portals out of hyprland module

---
 modules/desktop/de/hyprland.nix | 22 ----------------------
 modules/desktop/default.nix     |  6 ++++++
 modules/desktop/polkit-gtk.nix  | 21 +++++++++++++++++++++
 3 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 modules/desktop/polkit-gtk.nix

diff --git a/modules/desktop/de/hyprland.nix b/modules/desktop/de/hyprland.nix
index f07d294..a9e5f92 100644
--- a/modules/desktop/de/hyprland.nix
+++ b/modules/desktop/de/hyprland.nix
@@ -5,10 +5,6 @@
   # Optional, hint electron apps to use wayland:
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
-  # have portals
-  xdg.portal.enable = true;
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-
   programs.hyprlock.enable = true;
 
   environment.systemPackages = with pkgs; [
@@ -31,22 +27,4 @@
   ];
 
   programs.ssh.startAgent = true;
-
-  # enable polkit
-  security.polkit.enable = true;
-  systemd = {
-    user.services.polkit-gnome-authentication-agent-1 = {
-      description = "polkit-gnome-authentication-agent-1";
-      wantedBy = [ "graphical-session.target" ];
-      wants = [ "graphical-session.target" ];
-      after = [ "graphical-session.target" ];
-      serviceConfig = {
-          Type = "simple";
-          ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-          Restart = "on-failure";
-          RestartSec = 1;
-          TimeoutStopSec = 10;
-        };
-    };
-  };
 }
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 002678f..9377073 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -5,8 +5,14 @@
     ./pipewire.nix
     ./flatpak.nix
     ./fonts.nix
+    ./polkit-gtk.nix
   ];
 
   # Enable font dir for compatability
   fonts.fontDir.enable = true;
+
+  # enable desktop portals
+  xdg.portal.enable = true;
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+
 }
diff --git a/modules/desktop/polkit-gtk.nix b/modules/desktop/polkit-gtk.nix
new file mode 100644
index 0000000..c8f26ac
--- /dev/null
+++ b/modules/desktop/polkit-gtk.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+{
+  # enable polkit
+  security.polkit.enable = true;
+  systemd = {
+    user.services.polkit-gnome-authentication-agent-1 = {
+      description = "polkit-gnome-authentication-agent-1";
+      wantedBy = [ "graphical-session.target" ];
+      wants = [ "graphical-session.target" ];
+      after = [ "graphical-session.target" ];
+      serviceConfig = {
+          Type = "simple";
+          ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+          Restart = "on-failure";
+          RestartSec = 1;
+          TimeoutStopSec = 10;
+        };
+    };
+  };
+}