diff --git a/flake.lock b/flake.lock
index 2e36fd3..7c8cd4b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,21 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -239,6 +254,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1777578337,
+        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -289,6 +320,7 @@
         "nixpkgs": "nixpkgs_3",
         "nur": "nur",
         "opencode": "opencode",
+        "t3code": "t3code",
         "zen-browser": "zen-browser"
       }
     },
@@ -329,6 +361,25 @@
         "type": "github"
       }
     },
+    "t3code": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1777929657,
+        "narHash": "sha256-txfycKdyCoykyNmtZPUeqm8prX6ptTGtN18MvfIqvHA=",
+        "owner": "jetpham",
+        "repo": "nix-t3code",
+        "rev": "309ae4e459bb8315e417638240c38761a899f570",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jetpham",
+        "repo": "nix-t3code",
+        "type": "github"
+      }
+    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_3",
diff --git a/flake.nix b/flake.nix
index 5fa5978..0740e91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,7 @@
     opencode = {
       url = "github:anomalyco/opencode/dev";
     };
+    t3code.url = "github:jetpham/nix-t3code";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
diff --git a/home-modules/lib.nix b/home-modules/lib.nix
index 6f9c6be..4d795ad 100644
--- a/home-modules/lib.nix
+++ b/home-modules/lib.nix
@@ -130,44 +130,13 @@ let
   };
   betterbirdLauncher = pkgs.writeShellApplication {
     name = "betterbird-profile";
-    runtimeInputs = [
-      pkgs.coreutils
-      pkgs.gawk
-    ];
     text = ''
       set -euo pipefail
 
       profile_root="''${HOME:-${config.home.homeDirectory}}/.thunderbird"
-      profile_link="$profile_root/betterbird-current"
-      profile=""
+      profile="$profile_root/betterbird-current"
 
-      if [ -d "$profile_root" ]; then
-        for lock in "$profile_root"/*/.parentlock; do
-          if [ -e "$lock" ]; then
-            profile="''${lock%/.parentlock}"
-            ln -sfn "$profile" "$profile_link"
-            break
-          fi
-        done
-
-        if [ -z "$profile" ] && [ -e "$profile_link" ]; then
-          profile="$(readlink -f "$profile_link")"
-        fi
-
-        if [ -z "$profile" ] && [ -f "$profile_root/profiles.ini" ]; then
-          install_default="$(awk '
-            /^\[Install/ { in_install = 1; next }
-            /^\[/ { in_install = 0 }
-            in_install && /^Default=/ { sub(/^Default=/, ""); print; exit }
-          ' "$profile_root/profiles.ini")"
-          if [ -n "$install_default" ] && [ -d "$profile_root/$install_default" ]; then
-            profile="$profile_root/$install_default"
-            ln -sfn "$profile" "$profile_link"
-          fi
-        fi
-      fi
-
-      if [ -n "$profile" ] && [ -d "$profile" ]; then
+      if [ -d "$profile" ]; then
         exec ${betterbird}/bin/betterbird --profile "$profile" "$@"
       fi
 
diff --git a/home-modules/packages.nix b/home-modules/packages.nix
index 088f4c8..ec813b7 100644
--- a/home-modules/packages.nix
+++ b/home-modules/packages.nix
@@ -1,4 +1,9 @@
-{ pkgs, homeLib, ... }:
+{
+  inputs,
+  pkgs,
+  homeLib,
+  ...
+}:
 
 {
   home.packages = with pkgs; [
@@ -8,6 +13,7 @@
     codex
     ffmpeg-full
     homeLib.wrappedOpencode
+    inputs.t3code.packages.${pkgs.stdenv.hostPlatform.system}.t3code-nightly
     skills
     homeLib.zellijNewTabZoxide
     homeLib.zellijSyncTabName