diff --git a/fudo/profiles/common-ui.nix b/fudo/profiles/common-ui.nix
index 0e0cbfd..08be135 100644
--- a/fudo/profiles/common-ui.nix
+++ b/fudo/profiles/common-ui.nix
@@ -9,6 +9,7 @@ let
     libfixposix
     mono
     nomacs
+    oraclejdk
     python37Packages.youtube-dl
     sqlite
     system-config-printer
@@ -110,6 +111,12 @@ in mkIf ((profile == "desktop") || (profile == "laptop")) {
     gnome-user-share.enable = pkgs.lib.mkForce false;
   };
 
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    pinentryFlavor = if cfg.enable-gui then "gnome3" else "curses";
+  };
+
   services.dbus.socketActivated = true;
 
   sound.enable = true;
diff --git a/fudo/profiles/server.nix b/fudo/profiles/server.nix
index 5266e10..014a918 100644
--- a/fudo/profiles/server.nix
+++ b/fudo/profiles/server.nix
@@ -54,6 +54,7 @@ in {
         emacs-nox
         ldns
         ldns.examples
+        jdk12_headless
         racket-minimal
         reboot-if-necessary
         test-config