From 791b5535225453f2c5452a50e9988b8060342a95 Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene.liverman@ltnglobal.com>
Date: Fri, 27 Mar 2026 10:50:40 -0400
Subject: [PATCH 1/2] Ensure ffmpeg supports srt on macOS

---
 modules/hosts/darwin/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/hosts/darwin/default.nix b/modules/hosts/darwin/default.nix
index 9141006..f2b2b72 100644
--- a/modules/hosts/darwin/default.nix
+++ b/modules/hosts/darwin/default.nix
@@ -37,12 +37,16 @@
     };
     taps = [
       "homebrew/cask-fonts"
+      "homebrew-ffmpeg/ffmpeg"
       #"null-dev/firefox-profile-switcher"
       "theseal/ssh-askpass"
     ];
     brews = [
       "fastfetch"
-      "ffmpeg"
+      {
+        name = "homebrew-ffmpeg/ffmpeg/ffmpeg";
+        args = [ "with-srt" ];
+      }
       #"firefox-profile-switcher-connector" # having had this on seems to mean I need to toggle browser.profiles.enabled to true in about:config for the new built in version
       "mas"
       "ssh-askpass"

From 90175d5053c0a430a6b5699a0cf7b1c686d7d29f Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene.liverman@ltnglobal.com>
Date: Fri, 27 Mar 2026 16:27:27 -0400
Subject: [PATCH 2/2] =?UTF-8?q?Fixed=20ssh-based=20signing=20=F0=9F=A4=A6?=
 =?UTF-8?q?=F0=9F=8F=BB=E2=80=8D=E2=99=82=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/shared/home/general/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/shared/home/general/default.nix b/modules/shared/home/general/default.nix
index e5a8314..9ff8f69 100644
--- a/modules/shared/home/general/default.nix
+++ b/modules/shared/home/general/default.nix
@@ -133,9 +133,6 @@ in
     gh.enable = true;
     git = {
       enable = true;
-      settings = {
-        diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt";
-      };
       ignores = [
         "*~"
         "*.swp"
@@ -145,9 +142,17 @@ in
       lfs.enable = true;
       package = pkgs.gitFull;
       settings = {
+        diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt";
+
         init = {
           defaultBranch = "main";
         };
+        commit = {
+          gpgsign = true;
+        };
+        gpg = {
+          format = "ssh";
+        };
         merge = {
           conflictStyle = "diff3";
           tool = "meld";
@@ -157,11 +162,7 @@ in
         };
         user = {
           name = "Gene Liverman";
-        };
-        signing = {
-          format = "ssh";
-          key = "${config.home.homeDirectory}/.ssh/id_ed25519";
-          signByDefault = true;
+          signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
         };
       };
     }; # end git