From 34b03c3286f2244b69a60d85ef14a2096e24d52a Mon Sep 17 00:00:00 2001
From: Joe Frikker <joe.frikker@shibumi.com>
Date: Wed, 4 Feb 2026 20:28:24 -0500
Subject: [PATCH] wip

---
 home.org | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/home.org b/home.org
index bb40f56..9b5fa72 100644
--- a/home.org
+++ b/home.org
@@ -834,10 +834,10 @@ windows. I place windows in the bottom or on the right mostly depending on how w
 content to be.
 
 #+BEGIN_SRC elisp :noweb no :noweb-ref emacs_config
-  (setopt display-buffer-alist
-          '(((or "\\*Flymake diagnostics *"
-                 "\\*Embark Export *"
-                 "\\*Embark Collect *"
+  (setq display-buffer-alist
+        '(((or "\\*Flymake diagnostics *"
+               "\\*Embark Export *"
+               "\\*Embark Collect *"
                  "\\*xref*"
                  "\\*compilation\\*"
                  "\\*sly-mrepl *"
@@ -1248,11 +1248,13 @@ available? It seems to work for now anyway...
   consult-gh
   diff-hl
   forge
+  git-timemachine
   magit
 #+END_SRC
 
 #+BEGIN_SRC elisp :noweb-ref emacs_config
   (use-package magit
+    :defer nil
     :bind (("C-x g" . magit-status)
            ("s-g" . magit-status)
            ("C-x M-g" . magit-dispatch)
@@ -1270,7 +1272,9 @@ available? It seems to work for now anyway...
   (use-package forge
     :after magit
     :custom
-    (forge-edit-post-hook '(forge-create-pullreq-insert-single-commit-message)))
+    (forge-edit-post-hook '(forge-create-pullreq-insert-single-commit-message))
+    (forge-status-buffer-default-topic-filters
+     (forge--topics-spec :type 'topic :active nil :state 'open :order 'newest)))
 
   (use-package diff-hl
     :after magit
@@ -1354,6 +1358,8 @@ available? It seems to work for now anyway...
      :preview-key '(:debounce 0.4 any))
 
     (setq consult-narrow-key "<") ;; "C-+"
+    (setq xref-show-xrefs-function #'consult-xref
+          xref-show-definitions-function #'consult-xref)
     )
 
   (use-package vertico
@@ -1369,8 +1375,7 @@ available? It seems to work for now anyway...
 
   (use-package orderless
     :custom
-    (completion-styles '(orderless))
-    (orderless-matching-styles '(orderless-literal orderless-flex)))
+    (completion-styles '(orderless basic)))
 
   (use-package marginalia
     :config
@@ -1407,6 +1412,7 @@ available? It seems to work for now anyway...
 
 #+BEGIN_SRC elisp :noweb-ref emacs_config
   (use-package org
+    :defer nil
     :mode ("\\.org\\'" . org-mode)
     :bind (("C-c a" . org-agenda)
            ("C-c c" . org-capture)
@@ -1455,6 +1461,7 @@ available? It seems to work for now anyway...
     (set-face-attribute 'org-level-8 nil :font "Iosevka Aile"))
 
   (use-package org-present
+    :defer nil
     :commands (org-present)
     :config
     (defun my/org-present-start ()
@@ -1517,7 +1524,7 @@ available? It seems to work for now anyway...
            ("C-c n i" . org-roam-node-insert)
            ("C-c n c" . org-roam-capture))
     :config
-    (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
+    ;; (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
     (org-roam-db-autosync-mode))
 
   (use-package org-modern
@@ -1533,22 +1540,13 @@ available? It seems to work for now anyway...
 ** Terminal
 
 #+BEGIN_SRC nix :noweb-ref emacs_packages
-  eshell-vterm
-  vterm
+  eat
 #+END_SRC
 
 #+BEGIN_SRC elisp :noweb-ref emacs_config
-  (use-package em-term
+  (use-package eat
     :config
-    (push "hx" eshell-visual-commands))
-
-  (use-package vterm
-    :commands vterm)
-
-  (use-package eshell-vterm
-    :after eshell
-    :config
-    (eshell-vterm-mode))
+    (eat-eshell-mode))
 #+END_SRC
 
 ** Slack