M darwin/home.nix → darwin/home.nix

@@ -9,7 +9,7 @@
 {
   home.stateVersion = "24.05";
   home.username = "icy";
-  manual.manpages.enable = false;
+  manual.manpages.enable = true;
 
 
   imports = [

M programs/git.nix → programs/git.nix

@@ -9,14 +9,12 @@ enable = true;
     ignores = [ ".envrc" ];
     userEmail = "x@icyphox.sh";
     userName = "Anirudh Oppiliappan";
-    signing = {
-      key = "8A93F96F78C5D4C4";
-      signByDefault = true;
-    };
     extraConfig = {
       commit.verbose = true;
       init.defaultBranch = "master";
       pull.rebase = "true";
+      gpg.format = "ssh";
+      user.signingkey = "~/.ssh/id_ed25519.pub";
 
       url."ssh://git@github.com/".insteadOf = "https://github.com/";
       url."ssh://git@git.services.upcloud.com/".insteadOf = "https://git.services.upcloud.com/";

M programs/ssh.nix → programs/ssh.nix

@@ -10,44 +10,11 @@ matchBlocks = {
       "*" = {
         serverAliveInterval = 180;
         serverAliveCountMax = 3;
+        identityFile = [ "~/.ssh/id_ed25519" "~/.ssh/upcloud" ];
       };
       "github.com" = {
         user = "git";
         hostname = "github.com";
-        identityFile = [ "~/.ssh/id_ed25519" "~/.ssh/upcloud" ];
-      };
-      "fern" = {
-        user = "ubuntu";
-        hostname = "fern";
-        identityFile = "~/.ssh/id_rsa";
-      };
-      "egg" = {
-        user = "icy";
-        hostname = "egg";
-        identityFile = [ "~/.ssh/id_ed25519" "~/.ssh/upcloud" ];
-      };
-      "upcloud" = {
-        hostname = "git.services.upcloud.com";
-        identityFile = "~/.ssh/upcloud";
-      };
-      "denna" = {
-        hostname = "denna";
-        identityFile = [ "~/.ssh/id_ed25519" "~/.ssh/upcloud" ];
-      };
-      "jade" = {
-        user = "ubuntu";
-        hostname = "jade";
-        identityFile = "~/.ssh/id_rsa";
-      };
-      "lapis2" = {
-        user = "icy";
-        hostname = "150.230.131.193";
-        identityFile = "~/.ssh/id_rsa";
-      };
-      "aniverse" = {
-        user = "icy";
-        hostname = "94.237.18.93";
-        identityFile = "~/.ssh/id_ed25519";
       };
     };
   };