From ba410aa8380659358695a737f4bbf39bb8521d79 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Mon, 1 Apr 2024 18:06:05 +1300
Subject: [PATCH] refactor(wayland.utility): utility modules, add
 gammastep/tools

---
 .../desktop/wayland/utility/default.nix       | 55 ++++---------------
 .../wayland/utility/gammastep/default.nix     | 20 +++++++
 .../desktop/wayland/utility/tools/default.nix | 27 +++++++++
 3 files changed, 58 insertions(+), 44 deletions(-)
 create mode 100644 home/modules/desktop/wayland/utility/gammastep/default.nix
 create mode 100644 home/modules/desktop/wayland/utility/tools/default.nix

diff --git a/home/modules/desktop/wayland/utility/default.nix b/home/modules/desktop/wayland/utility/default.nix
index 6da50d8..9861f45 100644
--- a/home/modules/desktop/wayland/utility/default.nix
+++ b/home/modules/desktop/wayland/utility/default.nix
@@ -1,50 +1,17 @@
-{ lib, config, pkgs, ... }:
-
-let
-  cfg = config.homeModules.desktop.wayland.base;
-in
+{ lib, ... }:
 
 {
-  config = lib.mkIf cfg.enable {
-    home = {
-      packages = with pkgs; [
-        grim
-        gtk3
-        libnotify
-        waypipe
-        pulseaudio
-        pamixer
-        slurp
-        wf-recorder
-        wl-clipboard
-        wl-mirror
-        xdg-utils
-        wlr-randr
-      ];
-      sessionVariables = {
-        QT_QPA_PLATFORM = "wayland";
-        SDL_VIDEODRIVER = "wayland";
-        XDG_SESSION_TYPE = "wayland";
-      };
+  imports = [
+    ./gammastep
+    ./tools
+  ];
+
+  options.homeModules.desktop.wayland.utility = {
+    tools = {
+      enable = lib.mkEnableOption "Enable wayland specific tools";
     };
-    
-    systemd.user.targets.tray = {
-      Unit = {
-        Description = "Home Manager System Tray";
-        Requires = ["graphical-session-pre.target"];
-      };
+    gammastep = {
+      enable = lib.mkEnableOption "Enable gammastep module";
     };
-    
-    # services.gammastep = {
-    #   enable = true;
-    #   provider = "geoclue2";
-    #   temperature = {
-    #     day = 6000;
-    #     night = 4600;
-    #   };
-    #   settings = {
-    #     general.adjustment-method = "wayland";
-    #   };
-    # };
   };
 }
diff --git a/home/modules/desktop/wayland/utility/gammastep/default.nix b/home/modules/desktop/wayland/utility/gammastep/default.nix
new file mode 100644
index 0000000..e4adb8b
--- /dev/null
+++ b/home/modules/desktop/wayland/utility/gammastep/default.nix
@@ -0,0 +1,20 @@
+{ lib, config, ... }:
+
+let
+  cfg = config.homeModules.desktop.wayland.utility.gammastep;
+in
+
+{
+  config = lib.mkIf cfg.enable {
+    services.gammastep = {
+      enable = true;
+      enableVerboseLogging = true;
+      provider = "geoclue2";
+      temperature = {
+        day = 6000;
+        night = 4000;
+      };
+      settings.general.adjustment-method = "wayland";
+    };
+  };
+}
diff --git a/home/modules/desktop/wayland/utility/tools/default.nix b/home/modules/desktop/wayland/utility/tools/default.nix
new file mode 100644
index 0000000..6174448
--- /dev/null
+++ b/home/modules/desktop/wayland/utility/tools/default.nix
@@ -0,0 +1,27 @@
+{ lib, config, pkgs, ... }:
+
+let
+  cfg = config.homeModules.desktop.wayland.utility.tools;
+in
+
+{
+  config = lib.mkIf cfg.enable {
+    home = {
+      packages = with pkgs; [
+        grim
+        slurp
+        libnotify
+        wl-screenrec
+        wf-recorder
+        wl-clipboard
+      ];
+    };
+    
+    systemd.user.targets.tray = {
+      Unit = {
+        Description = "Home Manager System Tray";
+        Requires = ["graphical-session-pre.target"];
+      };
+    };
+  };
+}