diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 09d89e5..cf136b9 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -34,6 +34,5 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp192s0.useDHCP = lib.mkDefault true;
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/home.nix b/home.nix
index adc2d5d..c101546 100644
--- a/home.nix
+++ b/home.nix
@@ -5,6 +5,11 @@
   ...
 }:
 
+let
+  name = "Jet";
+  email = "jet@extremist.software";
+  sshSigningKey = "~/.ssh/id_ed25519.pub";
+in
 {
   imports = [ inputs.zen-browser.homeModules.default ];
 
@@ -123,10 +128,10 @@
 
   programs.git = {
     enable = true;
-    settings.user.name = "Jet";
-    settings.user.email = "jet@extremist.software";
+    settings.user.name = name;
+    settings.user.email = email;
     signing = {
-      key = "~/.ssh/id_ed25519.pub";
+      key = sshSigningKey;
       signByDefault = true;
       format = "ssh";
     };
@@ -280,14 +285,13 @@
     settings = {
       remotes.origin.auto-track-bookmarks = "glob:*";
       user = {
-        email = "jet@extremist.software";
-        name = "Jet";
+        inherit email name;
       };
 
       signing = {
         behavior = "own";
         backend = "ssh";
-        key = "~/.ssh/id_ed25519.pub";
+        key = sshSigningKey;
       };
 
       git = {