diff --git a/homes/x86_64-linux/jo/default.nix b/homes/x86_64-linux/jo/default.nix
index 4905028..dbffebf 100644
--- a/homes/x86_64-linux/jo/default.nix
+++ b/homes/x86_64-linux/jo/default.nix
@@ -29,6 +29,10 @@
     };
   };
 
+  programs = {
+    ghostty.enable = true;
+  };
+
   sops.secrets.wakatime-cfg = {
     format = "binary";
     sopsFile = ./secrets/wakatime.cfg;
@@ -37,7 +41,6 @@
 
   home.packages = with pkgs; [
     ## GENERAL
-    ghostty
     teams-for-linux
     enpass
     youtube-music
diff --git a/modules/nixos/system/nix/default.nix b/modules/nixos/system/nix/default.nix
index 7baf094..a2f072c 100644
--- a/modules/nixos/system/nix/default.nix
+++ b/modules/nixos/system/nix/default.nix
@@ -59,11 +59,64 @@ in
     nixpkgs.config.allowUnfree = true;
 
     # Dynamic libraries for unpackaged programs
+    # Use nix run github:mic92/nix-index-database libName.so to find the correct Nix packages
     programs.nix-ld = mkIf cfg.use-nixld {
       enable = true;
       libraries = with pkgs; [
+        # Core
         glibc
         libcxx
+        expat
+        nspr
+        nss
+
+        # Rendering / graphics
+        mesa
+        libglvnd
+        libdrm
+        libgbm
+        xorg.libxshmfence
+
+        # X11 stack
+        xorg.libX11
+        xorg.libxcb
+        xorg.libXext
+        xorg.libXfixes
+        xorg.libXrandr
+        xorg.libXcomposite
+        xorg.libXdamage
+        xorg.libXcursor
+        xorg.libXinerama
+        xorg.libXi
+        xorg.libXtst
+
+        # Input / keyboard
+        libxkbcommon
+
+        # Wayland (optional)
+        wayland
+
+        # GTK / accessibility stack
+        glib
+        dbus
+        at-spi2-core
+        at-spi2-atk
+        gtk3
+        gdk-pixbuf
+        pango
+        cairo
+
+        # Printing
+        cups
+
+        # Fonts / text
+        freetype
+        fontconfig
+        harfbuzz
+
+        # Sound
+        alsa-lib
+        pulseaudio
       ];
     };
   };