From 2fd69f6266e3ad6a79fd9df304beff8895eae926 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 27 Jul 2025 21:33:43 +0100
Subject: [PATCH] Move flameshot configuration

---
 home-manager/opdavies/t480.nix     |  1 -
 modules/home-manager/default.nix   |  1 -
 modules/home-manager/flameshot.nix | 26 --------------------------
 modules2/flameshot/enable.nix      |  3 +++
 modules2/flameshot/settings.nix    | 13 +++++++++++++
 5 files changed, 16 insertions(+), 28 deletions(-)
 delete mode 100644 modules/home-manager/flameshot.nix
 create mode 100644 modules2/flameshot/enable.nix
 create mode 100644 modules2/flameshot/settings.nix

diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index 69ce0434..60134ae1 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -28,7 +28,6 @@
         qutebrowser.enable = true;
       };
 
-      flameshot.enable = true;
       gtk.enable = true;
 
       media = {
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 8b161110..27a9e016 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -6,7 +6,6 @@
     ./browsers/qutebrowser.nix
     ./dev-commit.nix
     ./direnv.nix
-    ./flameshot.nix
     ./gtk.nix
     ./media/handbrake.nix
     ./media/mpv.nix
diff --git a/modules/home-manager/flameshot.nix b/modules/home-manager/flameshot.nix
deleted file mode 100644
index bf0ba018..00000000
--- a/modules/home-manager/flameshot.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.desktop.flameshot;
-in
-{
-  options.features.desktop.flameshot.enable = mkEnableOption "Enable flameshot";
-
-  config = mkIf cfg.enable {
-    services.flameshot = {
-      enable = true;
-
-      settings = {
-        General = {
-          disabledTrayIcon = false;
-          saveAfterCopy = true;
-          savePath = "${config.xdg.userDirs.pictures}/Screenshots";
-          showHelp = false;
-          uiColor = "#60a5fa";
-        };
-      };
-    };
-  };
-}
diff --git a/modules2/flameshot/enable.nix b/modules2/flameshot/enable.nix
new file mode 100644
index 00000000..721b375e
--- /dev/null
+++ b/modules2/flameshot/enable.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.gui.services.flameshot.enable = true;
+}
diff --git a/modules2/flameshot/settings.nix b/modules2/flameshot/settings.nix
new file mode 100644
index 00000000..86629d57
--- /dev/null
+++ b/modules2/flameshot/settings.nix
@@ -0,0 +1,13 @@
+{
+  flake.modules.homeManager.gui =
+    { config, ... }:
+    {
+      services.flameshot.settings.General = {
+        disabledTrayIcon = false;
+        saveAfterCopy = true;
+        savePath = "${config.xdg.userDirs.pictures}/Screenshots";
+        showHelp = false;
+        uiColor = "#60a5fa";
+      };
+    };
+}