fix(home::espanso): load match files with haumea

home/profiles/espanso/default.nix

@@ -1,11 +1,10 @@
 {
+  flake,
   pkgs,
-  # config,
   ...
 }:
 let
-  # inherit (config.lib.file) mkOutOfStoreSymlink;
-  # dotfieldDir = config.home.sessionVariables."DOTFIELD_DIR";
+  inherit (flake.inputs) haumea;
 
   cmx-espanso-list-triggers = pkgs.writeShellApplication {
     name = "cmx-espanso-list-triggers";
@@ -17,15 +16,6 @@ let
   };
 in
 {
-  imports = [
-    ./matches/base.nix
-    ./matches/time.nix
-    ./matches/urls.nix
-    ./matches/words.nix
-    ./matches/comment.nix
-    ./matches/_accented-words.nix
-  ];
-
   services.espanso = {
     enable = true;
     configs = {
@@ -39,6 +29,10 @@ in
         # search_shortcut = "ALT+CMD+SPACE";
       };
     };
+    matches = haumea.lib.load {
+      src = ./matches;
+      loader = haumea.lib.loaders.verbatim;
+    };
   };
 
   home.packages = [ cmx-espanso-list-triggers ];

home/profiles/espanso/matches/_accented-words.nix

@@ -1 +1 @@
-{ services.espanso.matches = null; }
+{ matches = null; }

home/profiles/espanso/matches/base.nix

@@ -1,5 +1,5 @@
 {
-  services.espanso.matches = [
+  matches = [
     {
       replace = "⌘";
       trigger = ";s;cmd";

home/profiles/espanso/matches/comment.nix

@@ -1,91 +1,89 @@
 {
-  services.espanso = {
-    global_vars = [
-      {
-        name = "clip";
-        type = "clipboard";
-      }
-    ];
+  global_vars = [
+    {
+      name = "clip";
+      type = "clipboard";
+    }
+  ];
 
-    matches = [
-      {
-        replace = "# <{{clipped}}>";
-        trigger = "# <";
-        vars = [
-          {
-            depends_on = [ "clip" ];
-            name = "clipped";
-            params = {
-              cmd = "echo \"$ESPANSO_CLIP\" \\\n| grep '^https://' || [[ $? == 1 ]]\n";
-            };
-            type = "shell";
-          }
-        ];
-      }
-      {
-        replace = ";; <{{clipped}}>";
-        trigger = ";; <";
-        vars = [
-          {
-            depends_on = [ "clip" ];
-            name = "clipped";
-            params = {
-              cmd = "echo \"$ESPANSO_CLIP\" \\\n| grep '^https://' || [[ $? == 1 ]]\n";
-            };
-            type = "shell";
-          }
-        ];
-      }
-      {
-        replace = "' :: <{{clipped}}>";
-        trigger = "' :: <";
-        vars = [
-          {
-            depends_on = [ "clip" ];
-            name = "clipped";
-            params = {
-              cmd = "echo \"$ESPANSO_CLIP\" \\\n| grep '^https://' || [[ $? == 1 ]]\n";
-            };
-            type = "shell";
-          }
-        ];
-      }
-      {
-        replace = "# SPDX-FileCopyrightText: {{year}} {{form.author}}\n# SPDX-License-Identifier: {{form.license}}";
-        trigger = ";#spdx";
-        vars = [
-          {
-            name = "form";
-            params = {
-              fields = {
-                author = {
-                  default = "Chris Montgomery <[email protected]>";
-                };
-                license = {
-                  default = "GPL-3.0-or-later";
-                  type = "choice";
-                  values = [
-                    "GPL-3.0-or-later"
-                    "MIT"
-                    "Apache-2.0"
-                    "MPL-2.0"
-                    "BSD-3-Clause"
-                  ];
-                };
+  matches = [
+    {
+      replace = "# <{{clipped}}>";
+      trigger = "# <";
+      vars = [
+        {
+          depends_on = [ "clip" ];
+          name = "clipped";
+          params = {
+            cmd = "echo \"$ESPANSO_CLIP\" \\\n| grep '^https://' || [[ $? == 1 ]]\n";
+          };
+          type = "shell";
+        }
+      ];
+    }
+    {
+      replace = ";; <{{clipped}}>";
+      trigger = ";; <";
+      vars = [
+        {
+          depends_on = [ "clip" ];
+          name = "clipped";
+          params = {
+            cmd = "echo \"$ESPANSO_CLIP\" \\\n| grep '^https://' || [[ $? == 1 ]]\n";
+          };
+          type = "shell";
+        }
+      ];
+    }
+    {
+      replace = "' :: <{{clipped}}>";
+      trigger = "' :: <";
+      vars = [
+        {
+          depends_on = [ "clip" ];
+          name = "clipped";
+          params = {
+            cmd = "echo \"$ESPANSO_CLIP\" \\\n| grep '^https://' || [[ $? == 1 ]]\n";
+          };
+          type = "shell";
+        }
+      ];
+    }
+    {
+      replace = "# SPDX-FileCopyrightText: {{year}} {{form.author}}\n# SPDX-License-Identifier: {{form.license}}";
+      trigger = ";#spdx";
+      vars = [
+        {
+          name = "form";
+          params = {
+            fields = {
+              author = {
+                default = "Chris Montgomery <[email protected]>";
+              };
+              license = {
+                default = "GPL-3.0-or-later";
+                type = "choice";
+                values = [
+                  "GPL-3.0-or-later"
+                  "MIT"
+                  "Apache-2.0"
+                  "MPL-2.0"
+                  "BSD-3-Clause"
+                ];
               };
-              layout = "author: [[author]]\nlicense: [[license]]\n";
-            };
-            type = "form";
-          }
-          {
-            name = "year";
-            params = {
-              format = "%Y";
             };
-            type = "date";
-          }
-        ];
-      }
-    ];
-  };
+            layout = "author: [[author]]\nlicense: [[license]]\n";
+          };
+          type = "form";
+        }
+        {
+          name = "year";
+          params = {
+            format = "%Y";
+          };
+          type = "date";
+        }
+      ];
+    }
+  ];
 }

home/profiles/espanso/matches/time.nix

@@ -1,60 +1,59 @@
 {
-  services.espanso = {
-    global_vars = [
-      {
-        name = "date";
-        params = {
-          format = "%F";
-        };
-        type = "date";
-      }
-      {
-        name = "time";
-        params = {
-          format = "%T";
-        };
-        type = "date";
-      }
-    ];
-    matches = [
-      {
-        replace = "{{date}}";
-        trigger = ";d;dd";
-      }
-      {
-        replace = "{{dateFriendly}}";
-        trigger = ";d.df";
-        vars = [
-          {
-            name = "dateFriendly";
-            params = {
-              format = "%B %e, %Y";
-            };
-            type = "date";
-          }
-        ];
-      }
-      {
-        replace = "{{time}}";
-        trigger = ";d;tt";
-      }
-      {
-        replace = "{{date}} {{time}}";
-        trigger = ";d.dt";
-      }
-      {
-        replace = "{{id}}";
-        trigger = ";d;id";
-        vars = [
-          {
-            name = "id";
-            params = {
-              format = "%Y%m%d%H%M%S";
-            };
-            type = "date";
-          }
-        ];
-      }
-    ];
-  };
+  global_vars = [
+    {
+      name = "date";
+      params = {
+        format = "%F";
+      };
+      type = "date";
+    }
+    {
+      name = "time";
+      params = {
+        format = "%T";
+      };
+      type = "date";
+    }
+  ];
+
+  matches = [
+    {
+      replace = "{{date}}";
+      trigger = ";d;dd";
+    }
+    {
+      replace = "{{dateFriendly}}";
+      trigger = ";d.df";
+      vars = [
+        {
+          name = "dateFriendly";
+          params = {
+            format = "%B %e, %Y";
+          };
+          type = "date";
+        }
+      ];
+    }
+    {
+      replace = "{{time}}";
+      trigger = ";d;tt";
+    }
+    {
+      replace = "{{date}} {{time}}";
+      trigger = ";d.dt";
+    }
+    {
+      replace = "{{id}}";
+      trigger = ";d;id";
+      vars = [
+        {
+          name = "id";
+          params = {
+            format = "%Y%m%d%H%M%S";
+          };
+          type = "date";
+        }
+      ];
+    }
+  ];
 }

home/profiles/espanso/matches/urls.nix

@@ -1,5 +1,5 @@
 {
-  services.espanso.matches = [
+  matches = [
     {
       replace = "https://github.com/";
       trigger = ";@gh";

home/profiles/espanso/matches/words.nix

@@ -1,5 +1,5 @@
 {
-  services.espanso.matches = [
+  matches = [
     {
       propagate_case = true;
       replace = "philadelphia";