From a0faf3ccd7536d6b8d478d3c9625f8f02dc4aced Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Mon, 20 Feb 2023 13:07:30 +0100
Subject: [PATCH] Move espanso to home-manager

---
 home-manager/desktop.nix                  |  1 +
 home-manager/software/espanso/default.nix | 29 +++++++++++++++++++++++
 modules/desktop/default.nix               |  1 -
 modules/espanso/default.nix               | 28 ----------------------
 4 files changed, 30 insertions(+), 29 deletions(-)
 create mode 100644 home-manager/software/espanso/default.nix
 delete mode 100644 modules/espanso/default.nix

diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index b7b2c5c..2b74953 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -6,6 +6,7 @@
     "${custom.inputs.self}/home-manager/software/calibre"
     "${custom.inputs.self}/home-manager/software/czkawka"
     "${custom.inputs.self}/home-manager/software/emacs"
+    "${custom.inputs.self}/home-manager/software/espanso"
     "${custom.inputs.self}/home-manager/software/evince"
     "${custom.inputs.self}/home-manager/software/fzf"
     "${custom.inputs.self}/home-manager/software/git"
diff --git a/home-manager/software/espanso/default.nix b/home-manager/software/espanso/default.nix
new file mode 100644
index 0000000..e267a70
--- /dev/null
+++ b/home-manager/software/espanso/default.nix
@@ -0,0 +1,29 @@
+{ ... }:
+{
+  services.espanso = {
+    enable = true;
+    settings = {
+      matches = [
+        {
+          trigger = "<dd";
+          replace = "{{current_date}}";
+          vars = [{
+            name = "current_date";
+            type = "date";
+            params = { format = "%Y-%m-%d"; };
+          }];
+        }
+        {
+          trigger = "<ds";
+          replace = "{{current_date}}";
+          vars = [{
+            name = "current_date";
+            type = "date";
+            params = { format = "%Y-%m-%d_%H%M%S"; };
+          }];
+        }
+      ];
+    };
+  };
+}
+
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index b503720..45d6fb9 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -5,7 +5,6 @@
     (import "${custom.inputs.self}/modules/droidcam" { inherit custom; })
     (import "${custom.inputs.self}/modules/email" { inherit custom; })
     (import "${custom.inputs.self}/modules/eog" { inherit custom; })
-    (import "${custom.inputs.self}/modules/espanso" { inherit custom; })
     "${custom.inputs.self}/modules/gnome"
     "${custom.inputs.self}/modules/hunspell"
     (import "${custom.inputs.self}/modules/libimobiledevice" { inherit custom; })
diff --git a/modules/espanso/default.nix b/modules/espanso/default.nix
deleted file mode 100644
index 1ee3095..0000000
--- a/modules/espanso/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ custom }: { ... }:
-{
-  services.espanso.enable = true;
-  home-manager.users.${custom.username} = {
-    xdg.configFile.espanso = {
-      target = "espanso/default.yml";
-      onChange = "systemctl --user restart espanso";
-      text = ''
-        matches:
-          - trigger: "<dd"
-            replace: "{{current_date}}"
-            vars:
-              - name: current_date
-                type: date
-                params:
-                  format: "%Y-%m-%d"
-          - trigger: "<ds"
-            replace: "{{current_date}}"
-            vars:
-              - name: current_date
-                type: date
-                params:
-                  format: "%Y-%m-%d_%H%M%S"
-      '';
-    };
-  };
-}
-