From 69b97c3d0af4f9ca8945ecc96219948eafebf6f3 Mon Sep 17 00:00:00 2001
From: Sebastien Bariteau <numkem@numkem.org>
Date: Sat, 25 Jul 2020 19:47:30 -0400
Subject: [PATCH 1/2] nixos/espanso: init module

---
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/desktops/espanso.nix | 25 +++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 nixos/modules/services/desktops/espanso.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f361163ca6319..88a0cbc64ebef 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -298,6 +298,7 @@
   ./services/desktops/dleyna-renderer.nix
   ./services/desktops/dleyna-server.nix
   ./services/desktops/pantheon/files.nix
+  ./services/desktops/espanso.nix
   ./services/desktops/flatpak.nix
   ./services/desktops/geoclue2.nix
   ./services/desktops/gsignond.nix
diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix
new file mode 100644
index 0000000000000..a070fc0613125
--- /dev/null
+++ b/nixos/modules/services/desktops/espanso.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let cfg = config.services.espanso;
+in {
+  meta = { maintainers = with stdenv.lib.maintainers; [ numkem ]; };
+
+  options = {
+    services.espanso = { enable = options.mkEnableOption "Espanso"; };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.espanso = {
+      description = "Espanso daemon";
+      path = with pkgs; [ espanso libnotify xclip ];
+      serviceConfig = {
+        ExecStart = "${pkgs.espanso}/bin/espanso daemon";
+        Restart = "on-failure";
+      };
+      wantedBy = [ "default.target" ];
+    };
+
+    environment.systemPackages = [ pkgs.espanso ];
+  };
+}

From fa56fcb69d41dcda9d3102d02647efa9d75454ba Mon Sep 17 00:00:00 2001
From: Sebastien Bariteau <numkem@numkem.org>
Date: Sat, 22 Aug 2020 09:22:24 -0400
Subject: [PATCH 2/2] Fix stdenv usage

---
 nixos/modules/services/desktops/espanso.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix
index a070fc0613125..cd2eadf88168e 100644
--- a/nixos/modules/services/desktops/espanso.nix
+++ b/nixos/modules/services/desktops/espanso.nix
@@ -3,7 +3,7 @@
 with lib;
 let cfg = config.services.espanso;
 in {
-  meta = { maintainers = with stdenv.lib.maintainers; [ numkem ]; };
+  meta = { maintainers = with lib.maintainers; [ numkem ]; };
 
   options = {
     services.espanso = { enable = options.mkEnableOption "Espanso"; };