home-manager/common/programs/core.nix

@@ -86,6 +86,10 @@ with lib; {
         package = pkgs.gitAndTools.gitFull;
         userName = "Nathan McCarty";
         userEmail = "nathan@mccarty.io";
+        signing = {
+          key = lib.mkDefault "B7A40A5D78C08885";
+          signByDefault = config.nathan.programs.util.git.gpgSign;
+        };
         ignores = [
           "**/*~"
           "*~"

machines/extremophile/home.nix

@@ -14,12 +14,4 @@
     };
     config = { isDesktop = true; };
   };
-  # Setup git commit signing with ssh key
-  programs.git = {
-    extraConfig = {
-      commit.gpgsign = true;
-      gpg.format = "ssh";
-      user.signingkey = "~/.ssh/id_ed25519.pub";
-    };
-  };
 }

modules/darwin/default.nix

@@ -74,12 +74,8 @@ in {
           { name = "signal"; }
           { name = "mattermost"; }
         ])
-        # Unconditionally install core utilites
+        # Unconditionally install our keep awake tool
-        [
+        [{ name = "keepingyouawake"; }]
-          { name = "keepingyouawake"; }
-          { name = "iterm2"; }
-          { name = "gpg-suite"; }
-        ]
       ];
       brews = lib.mkMerge [
         (lib.mkIf config.nathan.programs.syncthing [{