From 3217ba8549082711cf05cab8afac51ee0d01acf8 Mon Sep 17 00:00:00 2001
From: Tim McCarthy <thoomfish@gmail.com>
Date: Tue, 17 May 2022 16:47:06 -0700
Subject: [PATCH] Re-enable Emacs vterm

---
 doom/config.el | 1 +
 doom/init.el   | 2 +-
 nix/home.nix   | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doom/config.el b/doom/config.el
index 2ddd586..782b853 100644
--- a/doom/config.el
+++ b/doom/config.el
@@ -128,3 +128,4 @@
 
 ;; Insist on using regular "ls", to override Doom's insistence on "gls" on Mac+Nix
 (setq insert-directory-program "ls")
+(setq vterm-shell "xonsh")
diff --git a/doom/init.el b/doom/init.el
index 6663413..593b1d7 100644
--- a/doom/init.el
+++ b/doom/init.el
@@ -63,7 +63,7 @@
        ;;eshell            ; a consistent, cross-platform shell (WIP)
        ;;shell             ; a terminal REPL for Emacs
        ;;term              ; terminals in Emacs
-       ;;vterm             ; another terminals in Emacs
+       vterm             ; another terminals in Emacs
 
        :checkers
        syntax              ; tasing you for every semicolon you forget
diff --git a/nix/home.nix b/nix/home.nix
index 77f085c..fc0d5d4 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -43,11 +43,14 @@
     tmux
     kitty
     nodePackages.pyright
-    emacs28NativeComp
     coreutils
     zstd
   ];
 
   programs.direnv.enable = true;
   programs.direnv.nix-direnv.enable = true;
+
+  programs.emacs.enable = true;
+  programs.emacs.package = pkgs.emacs28NativeComp;
+  programs.emacs.extraPackages = epkgs: [ epkgs.vterm ];
 }