From a476a53d3a399079b44a4ca8fc48ade1f6a29440 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Wed, 11 Sep 2024 13:00:00 +0100
Subject: [PATCH] Update completions
---
lib/nixos/home-manager/modules/espanso.nix | 5 +---
.../home-manager/modules/espanso/matches.nix | 27 ++++++++++---------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/nixos/home-manager/modules/espanso.nix b/lib/nixos/home-manager/modules/espanso.nix
index 34162b1c..bc97a633 100644
--- a/lib/nixos/home-manager/modules/espanso.nix
+++ b/lib/nixos/home-manager/modules/espanso.nix
@@ -1,6 +1,3 @@
-let
- baseUrl = "https://www.oliverdavies.uk";
-in
{
services.espanso = {
enable = true;
@@ -12,7 +9,7 @@ in
};
matches = {
- base = import ./espanso/matches.nix { inherit baseUrl; };
+ base = import ./espanso/matches.nix;
};
};
}
diff --git a/lib/nixos/home-manager/modules/espanso/matches.nix b/lib/nixos/home-manager/modules/espanso/matches.nix
index 80c716af..15be5589 100644
--- a/lib/nixos/home-manager/modules/espanso/matches.nix
+++ b/lib/nixos/home-manager/modules/espanso/matches.nix
@@ -1,26 +1,29 @@
-{ baseUrl }:
-
+let
+ websiteUrl = "https://www.oliverdavies.uk";
+ dailyUrl = "https://dailydrupaler.com";
+ podcastUrl = "https://beyondblockspodcast.com";
+in
{
matches = [
{
trigger = ":archive";
- replace = "${baseUrl}/archive";
+ replace = "${websiteUrl}/archive";
}
{
trigger = ":atdc";
- replace = "${baseUrl}/atdc";
+ replace = "${websiteUrl}/atdc";
}
{
trigger = ":call";
- replace = "${baseUrl}/call";
+ replace = "${websiteUrl}/call";
}
{
trigger = ":coaching";
- replace = "${baseUrl}/team-coaching";
+ replace = "${websiteUrl}/team-coaching";
}
{
trigger = ":daily";
- replace = "https://dailydrupaler.com";
+ replace = "${dailyUrl}";
}
{
trigger = ":dotfiles";
@@ -40,7 +43,7 @@
}
{
trigger = ":guest";
- replace = "If you'd like to be a guest on https://beyondblockspodcast.com and talk about ..., I'd love to have you on the show.";
+ replace = "If you'd like to be a guest on ${podcastUrl} and talk about ..., I'd love to have you on the show.";
}
{
trigger = ":lh";
@@ -48,19 +51,19 @@
}
{
trigger = ":podcast";
- replace = "https://beyondblockspodcast.com";
+ replace = "${podcastUrl}";
}
{
trigger = ":pricing";
- replace = "${baseUrl}/pricing";
+ replace = "${websiteUrl}/pricing";
}
{
trigger = ":talks";
- replace = "${baseUrl}/presentations";
+ replace = "${websiteUrl}/presentations";
}
{
trigger = ":website";
- replace = "${baseUrl}";
+ replace = "${websiteUrl}";
}
{
trigger = ":zet";