diff --git a/configs/aerc.nix b/configs/aerc.nix
index 4f96795..6eccaa8 100644
--- a/configs/aerc.nix
+++ b/configs/aerc.nix
@@ -91,7 +91,7 @@
           imap.host = mailhost;
           imap.port = 993;
           smtp.host = mailhost;
-          smtp.port = 25;
+          smtp.port = 587;
           smtp.tls.useStartTls = true;
         };
       ical-ephemeris =
diff --git a/packages/pi.nix b/packages/pi.nix
new file mode 100644
index 0000000..528ea4a
--- /dev/null
+++ b/packages/pi.nix
@@ -0,0 +1,70 @@
+{
+  runCommand,
+  nodejs,
+  writeShellApplication,
+  lib,
+  jq,
+  cacert,
+  pi-llm,
+}:
+let
+  # Pre-install pi plugins into a fake npm global prefix
+  pluginPrefixRaw =
+    runCommand "pi-plugins-raw"
+      {
+        nativeBuildInputs = [
+          nodejs
+          cacert
+        ];
+        outputHashMode = "recursive";
+        outputHashAlgo = "sha256";
+        outputHash = "sha256-QZSVCJ0XirRz56v6ogxaB37c0bI8+OGEjrnqCFr/YI8=";
+        impureEnvVars = [
+          "http_proxy"
+          "https_proxy"
+        ];
+        SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+      }
+      ''
+        export HOME=$TMPDIR
+        export npm_config_prefix=$out
+        npm install -g pi-hooks shitty-extensions
+      '';
+
+  # Remove the resistance extension (annoying terminator quote widget)
+  pluginPrefix = runCommand "pi-plugins" { } ''
+    cp -a ${pluginPrefixRaw} $out
+    chmod -R u+w $out
+    pkg=$out/lib/node_modules/shitty-extensions/package.json
+    ${lib.getExe jq} '.pi.extensions |= map(select(contains("resistance") | not))' "$pkg" > "$pkg.tmp"
+    mv "$pkg.tmp" "$pkg"
+  '';
+in
+writeShellApplication {
+  runtimeInputs = [ nodejs ];
+  wrapper =
+    { exePath, ... }:
+    ''
+      set -efu
+      export npm_config_prefix="${pluginPrefix}"
+
+      # Ensure settings.json has our plugins listed
+      SETTINGS_DIR="''${PI_CODING_AGENT_DIR:-$HOME/.pi/agent}"
+      SETTINGS_FILE="$SETTINGS_DIR/settings.json"
+      mkdir -p "$SETTINGS_DIR"
+
+      # Add packages to settings if not already present
+      if [ ! -f "$SETTINGS_FILE" ]; then
+        echo '{"packages":["npm:pi-hooks","npm:shitty-extensions"]}' > "$SETTINGS_FILE"
+      else
+        for pkg in "npm:pi-hooks" "npm:shitty-extensions"; do
+          if ! grep -q "$pkg" "$SETTINGS_FILE"; then
+            ${lib.getExe jq} --arg p "$pkg" '.packages = ((.packages // []) + [$p] | unique)' "$SETTINGS_FILE" > "$SETTINGS_FILE.tmp"
+            mv "$SETTINGS_FILE.tmp" "$SETTINGS_FILE"
+          fi
+        done
+      fi
+
+      exec ${lib.getExe pi-llm} "$@"
+    '';
+}