From cd7a784e5b0b0624a09d5520fd6482a545f8bef6 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sun, 14 Apr 2019 16:01:36 -0400 Subject: [PATCH 1/1] emacs: update eshell prompt to match my bash prompt --- .emacs.d/init.org | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/.emacs.d/init.org b/.emacs.d/init.org index d02ed3b..77d5144 100644 --- 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 + (defvar user-@-host (concat (user-login-name) "@" (system-name) " ")) (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) - (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]] -- 2.20.1