diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..3a522e7
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,8 @@
+[user]
+	name = Jarkko Toivanen
+	email = jt@jakest.us
+	signingkey = 0EEA7DE3BE089B6F
+[core]
+	editor = nano
+[commit]
+	gpgsign = true
diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix
index b88166b..5ca2eaa 100644
--- a/nixos/desktop/configuration.nix
+++ b/nixos/desktop/configuration.nix
@@ -207,6 +207,7 @@
   programs.iotop.enable = true;
   programs.htop.enable = true;
   programs.tmux.enable = true;
+  programs.seahorse.enable = true;
   environment.systemPackages = with pkgs; [
     wget
     emacs
@@ -274,6 +275,12 @@
     ];
   };
 
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryFlavor = "gtk2";
+    enableSSHSupport = true;
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It is perfectly fine and recommended to leave