From 7d0351df18a68b0fdf5c705f0895f708434bc7e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= <thomasloven@gmail.com>
Date: Fri, 27 Dec 2024 00:25:40 +0100
Subject: [PATCH] Espanso for ..date expansion etc.

---
 bin/prettygit                 |  2 +-
 nixos/flake.lock              | 17 +++++++++++++++++
 nixos/flake.nix               |  8 ++++++--
 nixos/nixos/configuration.nix |  6 ++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/bin/prettygit b/bin/prettygit
index 7d81205..b0f5acf 100755
--- a/bin/prettygit
+++ b/bin/prettygit
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 HASH="%C(yellow)%h%C(reset)"
 RELATIVE_TIME="%C(green)%ar%C(reset)"
diff --git a/nixos/flake.lock b/nixos/flake.lock
index a6a19a1..409799b 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "espanso-fix": {
+      "locked": {
+        "lastModified": 1733174540,
+        "narHash": "sha256-Yv72ufzlbccsUgjnDtLfybPS4HJ7v3lN+pjmcH3/l+I=",
+        "owner": "pitkling",
+        "repo": "nixpkgs",
+        "rev": "2c39301457f9b5cb18a042a1f5643b15de551c79",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pitkling",
+        "ref": "espanso-fix-capabilities-export",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1734875076,
@@ -18,6 +34,7 @@
     },
     "root": {
       "inputs": {
+        "espanso-fix": "espanso-fix",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/nixos/flake.nix b/nixos/flake.nix
index ba7f115..de96ff5 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -3,9 +3,10 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    espanso-fix.url = "github:pitkling/nixpkgs/espanso-fix-capabilities-export";
   };
 
-  outputs = { self, nixpkgs, ... } @ inputs:
+  outputs = { self, nixpkgs, espanso-fix, ... } @ inputs:
   let
     inherit (self) outputs;
     system = "x86_64-linux";
@@ -14,7 +15,10 @@
     nixosConfigurations = {
       macbook = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs outputs; };
-        modules = [ ./nixos/configuration.nix ];
+        modules = [
+          ./nixos/configuration.nix
+          espanso-fix.nixosModules.espanso-capdacoverride
+        ];
       };
     };
   };
diff --git a/nixos/nixos/configuration.nix b/nixos/nixos/configuration.nix
index b96cb3e..62fafe2 100644
--- a/nixos/nixos/configuration.nix
+++ b/nixos/nixos/configuration.nix
@@ -141,6 +141,11 @@
     dataDir = "/home/thomas";
   };
 
+  services.espanso = {
+    enable = true;
+    package = pkgs.espanso-wayland;
+  };
+
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
@@ -165,6 +170,7 @@
     docker-compose
     kitty
     obsidian
+    python3Full
   ];
 
   # Enable the OpenSSH daemon.