diff --git a/common/fragments/graphical/default.nix b/common/fragments/graphical/default.nix
index 8cee1ef..4089607 100644
--- a/common/fragments/graphical/default.nix
+++ b/common/fragments/graphical/default.nix
@@ -15,12 +15,13 @@
 
   # User packages
   users.users.agatha.packages = with pkgs; [
+    (element-desktop.override { electron = electron_24; })
     blueberry
     brightnessctl
     broot
+    bspm
     clipmenu
     colmena
-    element-desktop
     ffmpeg
     flameshot
     gimp
@@ -39,9 +40,11 @@
     neofetch
     nil
     nitrogen
+    nmap
     obs-studio
     obsidian
     pfetch
+    polybar-spotify
     pridefetch
     prismlauncher
     rofi-calc
@@ -51,8 +54,6 @@
     xdg-utils
     xdotool
     yubioath-flutter
-    bspm
-    polybar-spotify
   ];
 
   # Brightness/volume keys
@@ -180,12 +181,17 @@
         hostname = "10.42.0.222";
         forwardX11 = true;
         forwardX11Trusted = true;
+        forwardAgent = true;
+        remoteForwards = [{
+          bind.address = "/run/user/1000/gnupg/S.gpg-agent";
+          host.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
+        }];
         extraOptions."TCPKeepAlive" = "yes";
       };
 
       "ritual" = {
         match = ''originalhost ritual exec "ip r | rg 10.42.0.0/24"'';
-        hostname = "10.42.0.230";
+        hostname = "10.42.0.104";
       };
     };
   };
@@ -251,5 +257,13 @@
     twitter-color-emoji
   ];
 
-  services.printing.enable = true;
+  services.printing = {
+    enable = true;
+    drivers = [ pkgs.hplip ];
+  };
+  services.avahi = {
+    enable = true;
+    nssmdns = true;
+    openFirewall = true;
+  };
 }
diff --git a/common/fragments/yubikey.nix b/common/fragments/yubikey.nix
index 67324e3..8432084 100644
--- a/common/fragments/yubikey.nix
+++ b/common/fragments/yubikey.nix
@@ -5,6 +5,7 @@
     enable = true;
     enableSSHSupport = true;
     pinentryFlavor = "gnome3";
+    enableExtraSocket = true;
   };
 
   services.pcscd.enable = true;