emacs: update eshell prompt to match my bash prompt

diff --git a/.emacs.d/init.org b/.emacs.d/init.org
index d02ed3b..77d5144 100644 (file)
--- a/.emacs.d/init.org
+++ b/.emacs.d/init.org
@@ -2133,29 +2133,17 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
   :defer 0.5
   :after eshell
   :config
   :defer 0.5
   :after eshell
   :config

+  (defvar user-@-host (concat (user-login-name) "@" (system-name) " "))

   (defun +eshell/prompt ()
     (let ((base/dir (shrink-path-prompt default-directory)))
   (defun +eshell/prompt ()
     (let ((base/dir (shrink-path-prompt default-directory)))

-      (concat (propertize (car base/dir)
+      (concat (propertize user-@-host 'face 'default)
+              (propertize (car base/dir)

                           'face 'font-lock-comment-face)
               (propertize (cdr base/dir)
                           'face 'font-lock-constant-face)
                           'face 'font-lock-comment-face)
               (propertize (cdr base/dir)
                           'face 'font-lock-constant-face)

-              (propertize (+eshell--current-git-branch)
-                          'face 'font-lock-function-name-face)
-              "\n"
-              ;; "λ"
-              ;; (propertize "λ" 'face 'eshell-prompt)
-              ;; needed for the input text to not have prompt face
-              (propertize "λ " 'face 'default))))
-
-  (defun +eshell--current-git-branch ()
-    (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n")
-                             when (string-match "^\*" match)
-                             collect match))))
-      (if (not (eq branch nil))
-          (concat " " (substring branch 2))
-        "")))
-  (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
-                         eshell-prompt-function #'+eshell/prompt))
+              (propertize "> " 'face 'default))))
+  (setq eshell-prompt-regexp (concat user-@-host ".*> ")
+        eshell-prompt-function #'+eshell/prompt))

 #+end_src
 
 ** [[https://github.com/peterwvj/eshell-up][eshell-up]]
 #+end_src
 
 ** [[https://github.com/peterwvj/eshell-up][eshell-up]]