modules/hosts/darwin/default.nix

@@ -37,16 +37,12 @@
     };
     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"

modules/shared/home/general/default.nix

@@ -133,6 +133,9 @@ in
     gh.enable = true;
     git = {
       enable = true;
+      settings = {
+        diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt";
+      };
       ignores = [
         "*~"
         "*.swp"
@@ -142,17 +145,9 @@ 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";
@@ -162,7 +157,11 @@ in
         };
         user = {
           name = "Gene Liverman";
-          signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
+        };
+        signing = {
+          format = "ssh";
+          key = "${config.home.homeDirectory}/.ssh/id_ed25519";
+          signByDefault = true;
         };
       };
     }; # end git