From d80de89fa470c267e0ef9b11d151d0d27e42dcb8 Mon Sep 17 00:00:00 2001
From: Kate Adkins <kate@deprekated.net>
Date: Tue, 26 Nov 2024 10:33:38 -0700
Subject: [PATCH] espanso+miko: bring back up to date

---
 espanso/match/_messengers.yml | 21 ---------------------
 espanso/match/base.yml        |  8 +++-----
 nixos/configs/dotfiles/hm.nix |  7 +++++--
 nixos/configs/gui/default.nix | 17 ++++++++++++-----
 nixos/configs/nix.nix         |  6 ++++--
 nixos/hosts/miko.nix          |  3 ++-
 wezterm/wezterm.lua           |  2 +-
 7 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/espanso/match/_messengers.yml b/espanso/match/_messengers.yml
index 8d95176..a35dcd7 100644
--- a/espanso/match/_messengers.yml
+++ b/espanso/match/_messengers.yml
@@ -24,24 +24,3 @@ matches:
   - trigger: "e;"
     word: true
     replace: "⚫E>"
-
-  # keep the non-discord ones, too
-  - trigger: "zo"
-    word: true
-    replace: "⚪O>"
-  - trigger: "zt"
-    word: true
-    replace: "🔵T>"
-  - trigger: "zk"
-    word: true
-    replace: "🟣K>"
-  - trigger: "zw"
-    word: true
-    replace: "🟢W>"
-  - trigger: "zs"
-    word: true
-    replace: "🔴S>"
-  - trigger: "ze"
-    word: true
-    replace: "⚫E>"
-
diff --git a/espanso/match/base.yml b/espanso/match/base.yml
index 15733c5..4420d1c 100644
--- a/espanso/match/base.yml
+++ b/espanso/match/base.yml
@@ -4,7 +4,7 @@
 
 matches:
 
-  # つ 
+  # つ
   - trigger: "tsu"
     word: true
     replace: "つ"
@@ -12,8 +12,7 @@ matches:
     word: true
     replace: "つ's"
 
-
-  # non-discord chats 
+  # non-discord chats
   - trigger: "zo"
     word: true
     replace: "⚪O>"
@@ -29,7 +28,7 @@ matches:
   - trigger: "zs"
     word: true
     replace: "🔴S>"
-  - trigger: "ze"
+  - trigger: "zE"
     word: true
     replace: "⚫E>"
 
@@ -61,4 +60,3 @@ matches:
   - trigger: "zah"
     word: true
     replace: "🤍💙💜💚❤️🩶"
-
diff --git a/nixos/configs/dotfiles/hm.nix b/nixos/configs/dotfiles/hm.nix
index 4205e95..c88505f 100644
--- a/nixos/configs/dotfiles/hm.nix
+++ b/nixos/configs/dotfiles/hm.nix
@@ -25,10 +25,13 @@
   xdg.configFile.looking-glass.source = ../../../looking-glass;
 
   # neovim
-  xdg.configFile."nvim".source = ../../../nvim;
+  xdg.configFile.nvim.source = ../../../nvim;
 
   # tmux
-  xdg.configFile."tmux".source = ../../../tmux;
+  xdg.configFile.tmux.source = ../../../tmux;
+
+  # espanso
+  xdg.configFile.espanso.source = ../../../espanso;
 
   # kakoune
   #xdg.configFile."kak/autoload".source = ../../../kak/autoload;
diff --git a/nixos/configs/gui/default.nix b/nixos/configs/gui/default.nix
index 1498ff2..4b6bc4e 100644
--- a/nixos/configs/gui/default.nix
+++ b/nixos/configs/gui/default.nix
@@ -2,7 +2,7 @@
 {
   niri,
   pkgs,
-  config,
+  lib,
   ...
 }:
 {
@@ -34,6 +34,17 @@
     )
   ];
 
+  # Also provide an xserver and plasma, for when we need accessibility.
+  services.xserver.enable = true;
+  services.desktopManager.plasma6.enable = true;
+
+  # Don't let Plasma override TLP with PPD.
+  services.power-profiles-daemon.enable = lib.mkForce false;
+
+
+  # Enable espanso, when possible.
+  services.espanso.enable = true;
+
   environment.systemPackages = with pkgs; [
     wtype
     wl-clipboard
@@ -129,10 +140,6 @@
     };
   };
 
-	# Provide Plasma6 for Talon support.
-	services.xserver.enable = true;
-	services.desktopManager.plasma6.enable = true;
-
   # Use KDE connect.
   programs.kdeconnect.enable = true;
 
diff --git a/nixos/configs/nix.nix b/nixos/configs/nix.nix
index 624c643..fda698e 100644
--- a/nixos/configs/nix.nix
+++ b/nixos/configs/nix.nix
@@ -12,13 +12,15 @@
       # Use nix, lix, and our local cache.
       substituters = [
         "https://cache.nixos.org"
-        "https://cache.lix.systems"
-        "https://niri.cachix.org"
+        "https://cache.lix.systems" # for lix
+        "https://niri.cachix.org"   # for niri
+        "https://cache.soopy.moe"   # for t2-linux
       ];
       trusted-public-keys = [
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
         "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
         "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
+        "cache.soopy.moe-1:0RZVsQeR+GOh0VQI9rvnHz55nVXkFardDqfm4+afjPo="
       ];
 
     };
diff --git a/nixos/hosts/miko.nix b/nixos/hosts/miko.nix
index 1360a54..7f5b14b 100644
--- a/nixos/hosts/miko.nix
+++ b/nixos/hosts/miko.nix
@@ -16,8 +16,9 @@
 
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  # Disable the deprecated (but still default true!) tinydfr option.
+	# Use the more up-to-date touchBar option to enabel the touchbar.
   hardware.apple-t2.enableTinyDfr = false;
+  hardware.apple.touchBar.enable = true;
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua
index 147728a..85c312d 100644
--- a/wezterm/wezterm.lua
+++ b/wezterm/wezterm.lua
@@ -206,7 +206,7 @@ config = {
 -- Font Size Tweaks
 --
 font_overrides = {
-	miko = 16,
+	miko = 10,
 	hinata = 16,
 	valere = 12,
 	utol = 13,