diff --git a/home/jroeger.nix b/home/jroeger.nix
index 5c59d90..0f73f62 100644
--- a/home/jroeger.nix
+++ b/home/jroeger.nix
@@ -12,6 +12,8 @@
   home.username = "jroeger";
   home.homeDirectory = "/home/jroeger";
 
+  yubikey.pinentry = "gnome3";
+
   # This value determines the Home Manager release that your configuration is
   # compatible with. This helps avoid breakage when a new Home Manager release
   # introduces backwards incompatible changes.
diff --git a/modules/home/doom/doom.nix b/modules/home/doom/doom.nix
index f8015ab..68a7a34 100644
--- a/modules/home/doom/doom.nix
+++ b/modules/home/doom/doom.nix
@@ -12,6 +12,7 @@
   doom-path-pkgs = with pkgs; [
     (ripgrep.override {withPCRE2 = true;})
     alejandra
+    aspell
     binutils
     ccls
     clang-tools
@@ -55,14 +56,13 @@
         --add-flags "--init-directory=${config.xdg.configHome}/doom-emacs" \
         --set DOOMDIR "${config.home.sessionVariables.DOOMDIR}" \
         --set DOOMLOCALDIR "${config.home.sessionVariables.DOOMLOCALDIR}" \
-        --suffix LD_LIBRARY_PATH : "${pkgs.stdenv.cc.cc.lib}/lib"
+        --prefix LD_LIBRARY_PATH : "${pkgs.stdenv.cc.cc.lib}/lib"
 
       wrapProgram $out/bin/emacsclient \
         --prefix PATH : ${lib.makeBinPath doom-path-pkgs} \
         --set DOOMDIR "${config.home.sessionVariables.DOOMDIR}" \
         --set DOOMLOCALDIR "${config.home.sessionVariables.DOOMLOCALDIR}" \
-        --suffix LD_LIBRARY_PATH : "${pkgs.stdenv.cc.cc.lib}/lib" \
-        --add-flags "--socket-name=${doom-socket-name}"
+        --prefix LD_LIBRARY_PATH : "${pkgs.stdenv.cc.cc.lib}/lib"
     '';
   };
   doom-setup = pkgs.writeShellScript "doom-setup" ''