From c132e7e5dcc11ccb9e85ea56e2af89c8fe91d938 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Tue, 5 Nov 2024 15:17:55 -0500
Subject: [PATCH] refactor: separate out module

---
 modules/nixos/linux/gui/_1password.nix        |  1 +
 modules/nixos/linux/gui/hyprland/default.nix  | 31 +++----------------
 .../nixos/linux/gui/hyprland/fix-cursor.nix   | 29 +++++++++++++++++
 3 files changed, 34 insertions(+), 27 deletions(-)
 create mode 100644 modules/nixos/linux/gui/hyprland/fix-cursor.nix

diff --git a/modules/nixos/linux/gui/_1password.nix b/modules/nixos/linux/gui/_1password.nix
index 4516f70..33e7478 100644
--- a/modules/nixos/linux/gui/_1password.nix
+++ b/modules/nixos/linux/gui/_1password.nix
@@ -8,4 +8,5 @@
     # require enabling PolKit integration on some desktop environments (e.g. Plasma).
     polkitPolicyOwners = [ "srid" ];
   };
+  security.polkit.enable = true;
 }
diff --git a/modules/nixos/linux/gui/hyprland/default.nix b/modules/nixos/linux/gui/hyprland/default.nix
index fa75feb..a265486 100644
--- a/modules/nixos/linux/gui/hyprland/default.nix
+++ b/modules/nixos/linux/gui/hyprland/default.nix
@@ -15,35 +15,12 @@ in
   security.pam.services.hyprlock = { };
 
   home-manager.sharedModules = [{
+    imports = [ ./fix-cursor.nix ];
     services.dunst.enable = true;
-    programs.hyprlock.enable = true;
+    programs = {
+      hyprlock.enable = true;
+    };
     home.sessionVariables.NIXOS_OZONE_WL = "1";
-
-    # https://wiki.hyprland.org/0.41.0/Nix/Hyprland-on-Home-Manager/#fixing-problems-with-themes
-    home.pointerCursor = {
-      gtk.enable = true;
-      # x11.enable = true;
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Classic";
-      size = 16;
-    };
-    gtk = {
-      enable = true;
-      theme = {
-        package = pkgs.flat-remix-gtk;
-        name = "Flat-Remix-GTK-Grey-Darkest";
-      };
-
-      iconTheme = {
-        package = pkgs.adwaita-icon-theme;
-        name = "Adwaita";
-      };
-
-      font = {
-        name = "Sans";
-        size = 11;
-      };
-    };
   }];
 
   environment.systemPackages = with pkgs; [
diff --git a/modules/nixos/linux/gui/hyprland/fix-cursor.nix b/modules/nixos/linux/gui/hyprland/fix-cursor.nix
new file mode 100644
index 0000000..188b0d9
--- /dev/null
+++ b/modules/nixos/linux/gui/hyprland/fix-cursor.nix
@@ -0,0 +1,29 @@
+# https://wiki.hyprland.org/0.41.0/Nix/Hyprland-on-Home-Manager/#fixing-problems-with-themes
+{ pkgs, ... }:
+
+{
+  home.pointerCursor = {
+    gtk.enable = true;
+    # x11.enable = true;
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Classic";
+    size = 16;
+  };
+  gtk = {
+    enable = true;
+    theme = {
+      package = pkgs.flat-remix-gtk;
+      name = "Flat-Remix-GTK-Grey-Darkest";
+    };
+
+    iconTheme = {
+      package = pkgs.adwaita-icon-theme;
+      name = "Adwaita";
+    };
+
+    font = {
+      name = "Sans";
+      size = 11;
+    };
+  };
+}