Extract a flameshot mixin

home/opdavies/hosts/lemp11.nix

@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    flameshot.enable = true;
     gimp.enable = true;
     gtk.enable = true;
     handbrake.enable = true;

home/opdavies/hosts/t480.nix

@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    flameshot.enable = true;
     gimp.enable = true;
     gtk.enable = true;
     handbrake.enable = true;

home/opdavies/hosts/t490.nix

@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    flameshot.enable = true;
     gimp.enable = true;
     gtk.enable = true;
     handbrake.enable = true;

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

modules/home-manager/desktop/default.nix

@@ -1,6 +1,5 @@
 {
   imports = [
-    ./flameshot.nix
     ./gtk.nix
     ./media
   ];

modules/home-manager/desktop/flameshot.nix

@@ -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";
-        };
-      };
-    };
-  };
-}

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";
+          };
+        };
+      };
+    };
+}