diff --git a/machines/fujin/main/home.nix b/machines/fujin/main/home.nix
index 84bb4bd..9a5fa82 100644
--- a/machines/fujin/main/home.nix
+++ b/machines/fujin/main/home.nix
@@ -113,6 +113,7 @@
     jetbrains.webstorm
     #jetbrains.pycharm-community-src
     direnv
+    devenv
     semgrep
     devpod
     tmux
diff --git a/modules/development/emacs/default.nix b/modules/development/emacs/default.nix
index 284d076..5b6822b 100644
--- a/modules/development/emacs/default.nix
+++ b/modules/development/emacs/default.nix
@@ -18,7 +18,7 @@ in {
         ## Emacs itself
         binutils # native-comp needs 'as', provided by this
         # 28.2 + native-comp
-        ((emacsPackagesFor emacs-unstable).emacsWithPackages (epkgs: [
+        ((emacsPackagesFor emacs30).emacsWithPackages (epkgs: [
           epkgs.vterm
           epkgs.treesit-grammars.with-all-grammars
           epkgs.mu4e