From 490aa3eb995f2f8287f83d145baff57a007bad27 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 5 Apr 2025 09:00:56 +0100
Subject: [PATCH] Extract a flameshot mixin

---
 home/opdavies/hosts/lemp11.nix             |  1 -
 home/opdavies/hosts/t480.nix               |  1 -
 home/opdavies/hosts/t490.nix               |  1 -
 hosts/t480/configuration.nix               |  1 +
 modules/home-manager/desktop/default.nix   |  1 -
 modules/home-manager/desktop/flameshot.nix | 28 ----------------------
 modules/mixins/flameshot.nix               | 19 +++++++++++++++
 7 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 modules/home-manager/desktop/flameshot.nix
 create mode 100644 modules/mixins/flameshot.nix

diff --git a/home/opdavies/hosts/lemp11.nix b/home/opdavies/hosts/lemp11.nix
index 3e06301f..4fa9c514 100644
--- a/home/opdavies/hosts/lemp11.nix
+++ b/home/opdavies/hosts/lemp11.nix
@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    flameshot.enable = true;
     gimp.enable = true;
     gtk.enable = true;
     handbrake.enable = true;
diff --git a/home/opdavies/hosts/t480.nix b/home/opdavies/hosts/t480.nix
index 28c8ed95..42278215 100644
--- a/home/opdavies/hosts/t480.nix
+++ b/home/opdavies/hosts/t480.nix
@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    flameshot.enable = true;
     gimp.enable = true;
     gtk.enable = true;
     handbrake.enable = true;
diff --git a/home/opdavies/hosts/t490.nix b/home/opdavies/hosts/t490.nix
index e1e61c8a..94fb4a17 100644
--- a/home/opdavies/hosts/t490.nix
+++ b/home/opdavies/hosts/t490.nix
@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    flameshot.enable = true;
     gimp.enable = true;
     gtk.enable = true;
     handbrake.enable = true;
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 10bd033a..c10771a4 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -11,6 +11,7 @@
     ../../modules/mixins/bluetooth.nix
     ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
+    ../../modules/mixins/flameshot.nix
     ../../modules/mixins/fonts.nix
     ../../modules/mixins/fzf.nix
     ../../modules/mixins/phpactor
diff --git a/modules/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix
index c4ca2a4c..5cd22e71 100644
--- a/modules/home-manager/desktop/default.nix
+++ b/modules/home-manager/desktop/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./flameshot.nix
     ./gtk.nix
     ./media
   ];
diff --git a/modules/home-manager/desktop/flameshot.nix b/modules/home-manager/desktop/flameshot.nix
deleted file mode 100644
index c9126c2f..00000000
--- a/modules/home-manager/desktop/flameshot.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  config,
-  lib,
-  username,
-  ...
-}:
-
-with lib;
-
-{
-  options.homeManagerModules.flameshot.enable = mkEnableOption "Enable flameshot";
-
-  config = mkIf config.homeManagerModules.flameshot.enable {
-    services.flameshot = {
-      enable = true;
-
-      settings = {
-        General = {
-          disabledTrayIcon = false;
-          saveAfterCopy = true;
-          savePath = "/home/${username}/Pictures/Screenshots";
-          showHelp = false;
-          uiColor = "#60a5fa";
-        };
-      };
-    };
-  };
-}
diff --git a/modules/mixins/flameshot.nix b/modules/mixins/flameshot.nix
new file mode 100644
index 00000000..6b3bf1fb
--- /dev/null
+++ b/modules/mixins/flameshot.nix
@@ -0,0 +1,19 @@
+{
+  home-manager.users.opdavies =
+    { config, ... }:
+    {
+      services.flameshot = {
+        enable = true;
+
+        settings = {
+          General = {
+            disabledTrayIcon = false;
+            saveAfterCopy = true;
+            savePath = "${config.xdg.userDirs.pictures}/Screenshots";
+            showHelp = false;
+            uiColor = "#60a5fa";
+          };
+        };
+      };
+    };
+}