diff --git a/elisp/eshell-setup.el b/elisp/eshell-setup.el
index 56c51a3..8cd7380 100644
--- a/elisp/eshell-setup.el
+++ b/elisp/eshell-setup.el
@@ -1,23 +1,4 @@
-;; colors in eshell
-
-(add-hook 'eshell-mode-hook
-          (lambda ()
-            (setenv "TERM" "xterm-256color")))
-(add-hook 'eshell-before-prompt-hook (lambda ()
-				       (setq xterm-color-preserve-properties t)))
-
 (require 'esh-mode)
 (add-to-list 'eshell-preoutput-filter-functions 'xterm-color-filter)
 (setq eshell-output-filter-functions
       (remove 'eshell-handle-ansi-color eshell-output-filter-functions))
-
-;; Don't cycle through history with <up> and <down>
-;; Those keys were previously bound to:
-;; eshell-previous-matching-input-from-input and
-;; eshell-next-matching-input-from-input, respectively
-(defun my-eshell-setup ()
-  (progn
-    (define-key eshell-hist-mode-map (kbd "<up>") nil)
-    (define-key eshell-hist-mode-map (kbd "<down>") nil)))
-
-(add-hook 'eshell-mode-hook #'my-eshell-setup)
diff --git a/elisp/extras.el b/elisp/extras.el
index 40c54e1..1b8f4b4 100644
--- a/elisp/extras.el
+++ b/elisp/extras.el
@@ -76,6 +76,30 @@
 ;; We need colors in eshell
 (use-package xterm-color)
 
+(use-package eshell
+  :straight (:type built-in)
+  :hook (eshell-mode . (lambda ()
+                         (setenv "TERM" "xterm-256color")))
+  :hook (eshell-before-prompt . (lambda ()
+				  (setq xterm-color-preserve-properties t)))
+  :hook (eshell-mode . (lambda ()
+                         (progn
+                           (define-key eshell-hist-mode-map (kbd "<up>") nil)
+                           (define-key eshell-hist-mode-map (kbd "<down>") nil))))
+  :config
+  (load "~/.emacs.d/elisp/eshell-setup.el"))
+
+;; eat terminal emulator:
+(use-package eat
+  :straight (:type git
+                   :host codeberg
+                   :repo "akib/emacs-eat"
+                   :files ("*.el" ("term" "term/*.el") "*.texi"
+                           "*.ti" ("terminfo/e" "terminfo/e/*")
+                           ("terminfo/65" "terminfo/65/*")
+                           ("integration" "integration/*")
+                           (:exclude ".dir-locals.el" "*-tests.el"))))
+
 ;; git
 (use-package magit
   :demand t
@@ -150,6 +174,18 @@
   :defer t
   :hook ((python-base-mode . eglot-ensure)))
 
+(use-package dape)
+
+;; For a more ergonomic Emacs and `dape' experience
+(use-package repeat
+  :custom
+  (repeat-mode +1))
+
+;; Left and right side windows occupy full frame height
+(use-package emacs
+  :custom
+  (window-sides-vertical t))
+
 ;; TRAMP
 (load "~/.emacs.d/elisp/tramp-setup.el")
 (load "~/.emacs.d/elisp/outline-keymap.el")