oreodave/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eshell-prompt: Fix some bugs, add some features, clean up

Browse Source
This commit is contained in:
Aryadev Chavali
2025-07-10 00:13:24 +01:00
parent a2b4c43b93
commit b6ef43590e
1 changed files with 101 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
Emacs/.config/emacs/elisp/eshell-prompt.el
View File

@@ -27,6 +27,9 @@
(defvar ep/user-prompt " λ " (defvar ep/user-prompt " λ "
"Prompt for user to input.") "Prompt for user to input.")
(defvar ep/pwd-max-len 30)
(defvar ep/git-branch-max-len 5)
(defvar ep/dir-colour "deepskyblue") (defvar ep/dir-colour "deepskyblue")
(defvar ep/success-colour "green2") (defvar ep/success-colour "green2")
(defvar ep/failure-colour "red") (defvar ep/failure-colour "red")
@@ -41,7 +44,7 @@
`(("┌──" :foreground ,ep/pipe-colour) `(("┌──" :foreground ,ep/pipe-colour)
"[" "["
(,(ep/--user-and-remote) :foreground ,ep/remote-colour) (,(ep/--user-and-remote) :foreground ,ep/remote-colour)
(,(abbreviate-file-name (tramp-file-local-name (eshell/pwd))) (,(ep/--pwd)
:foreground ,ep/dir-colour) :foreground ,ep/dir-colour)
,(if (string= git "") ,(if (string= git "")
"" ""
@@ -52,16 +55,13 @@
(,ep/user-prompt :foreground ,(ep/--colour-on-last-command))) (,ep/user-prompt :foreground ,(ep/--colour-on-last-command)))
(mapconcat (mapconcat
#'(lambda (item) #'(lambda (item)
(if (listp item) (thread-last
(propertize (car item) (propertize (car item)
'font-lock-face (cdr item) 'font-lock-face (cdr item)
'front-sticky '(font-lock-face read-only) 'front-sticky '(font-lock-face read-only)
'rear-nonsticky '(font-lock-face read-only)) 'rear-nonsticky '(font-lock-face read-only))
item)))))) (if (not (listp item))
item)))))))
(defun ep/--with-fg-colour (s colour)
"Helper which propertises a string `s' with foreground colour `colour'"
(propertize s 'font-lock-face `(:foreground ,colour)))
(defun ep/--colour-on-last-command () (defun ep/--colour-on-last-command ()
"Returns an Emacs colour based on ESHELL-LAST-COMMAND-STATUS." "Returns an Emacs colour based on ESHELL-LAST-COMMAND-STATUS."
@@ -69,6 +69,35 @@
ep/success-colour ep/success-colour
ep/failure-colour)) ep/failure-colour))
(defun ep/--with-fg-colour (s colour)
"Helper which propertises a string `s' with foreground colour `colour'"
(propertize s 'font-lock-face `(:foreground ,colour)))
(defun ep/--user-and-remote ()
"If in a remote directory, return a string representing that host,
otherwise empty string."
(if (file-remote-p default-directory)
(let ((user (file-remote-p default-directory 'user))
(host (file-remote-p default-directory 'host)))
(thread-first
(if user
(format "%s@%s" user host)
host)
(concat ":")))
""))
(defun ep/--git-status ()
"Returns a completely formatted string of form
BRANCH-NAME(REMOTE-STATUS)(CHANGES)."
(let ((git-branch (ep/--git-branch-name)))
(if (null git-branch)
""
(format
"%s(%s)(%s)"
(ep/--with-fg-colour git-branch ep/branch-name-colour)
(ep/--git-remote-status)
(ep/--git-change-status)))))
(defun ep/--git-remote-status () (defun ep/--git-remote-status ()
"Returns a propertized string for the status of a repository "Returns a propertized string for the status of a repository
in comparison to its remote. 3 differing strings are returned in comparison to its remote. 3 differing strings are returned
@@ -86,14 +115,13 @@ behind or ahead the local repository is."
(diff (cl-position "by" branch-status :test #'string=))) (diff (cl-position "by" branch-status :test #'string=)))
(if (null diff) (if (null diff)
(ep/--with-fg-colour "=" ep/success-colour) (ep/--with-fg-colour "=" ep/success-colour)
(let ((n (nth (+ 1 diff) branch-status))) (concat
(concat (cond
(cond ((string= status "ahead")
((string= status "ahead") (ep/--with-fg-colour "→" ep/ahead-colour))
(ep/--with-fg-colour "→" ep/ahead-colour)) ((string= status "behind")
((string= status "behind") (ep/--with-fg-colour "←" ep/failure-colour)))
(ep/--with-fg-colour "←" ep/failure-colour))) (nth (1+ diff) branch-status)))))
n)))))
(defun ep/--git-change-status () (defun ep/--git-change-status ()
"Returns a propertized string for the condition of the worktree in "Returns a propertized string for the condition of the worktree in
@@ -108,16 +136,19 @@ If there are changes then we characterise it by the following parameters:
- untracked files in red - untracked files in red
" "
(let* ((git-cmd "git status -s") (let* ((git-cmd "git status -s")
(command-output (command-output (thread-first
(thread-first (shell-command-to-string git-cmd) (shell-command-to-string git-cmd)
(split-string "\n") (split-string "\n")
butlast)) butlast))
(status-codes (mapcar #'(lambda (s) (cons (substring s 0 1) (substring s 1 2))) (status-codes (mapcar #'(lambda (s) (cons (substring s 0 1) (substring s 1 2)))
command-output)) command-output))
(filter-f (lambda (x) (not (or (string= x "?") (string= x " "))))) (count-f (lambda (coll) (thread-first
(lambda (x) (not (or (string= x "?") (string= x " "))))
(cl-count-if
coll))))
(total (length status-codes)) (total (length status-codes))
(staged (cl-count-if (lambda (x) (funcall filter-f (car x))) status-codes)) (staged (funcall count-f (mapcar #'car status-codes)))
(modified (cl-count-if (lambda (x) (funcall filter-f (cdr x))) status-codes)) (modified (funcall count-f (mapcar #'cdr status-codes)))
(not-tracked (cl-count-if (lambda (x) (string= (cdr x) "?")) status-codes))) (not-tracked (cl-count-if (lambda (x) (string= (cdr x) "?")) status-codes)))
(if (= total 0) (if (= total 0)
(ep/--with-fg-colour "✓" ep/success-colour) (ep/--with-fg-colour "✓" ep/success-colour)
@@ -135,42 +166,52 @@ If there are changes then we characterise it by the following parameters:
If a deteached head, return the SHA." If a deteached head, return the SHA."
(let* ((branch-name (thread-last (let* ((branch-name (thread-last
(split-string (shell-command-to-string "git branch") "\n") (split-string (shell-command-to-string "git branch") "\n")
(cl-remove-if #'(lambda (s) (= (length s) 0))) (cl-remove-if #'(lambda (s) (thread-last (length s) (= 0))))
(cl-find-if #'(lambda (s) (string= "*" (substring s 0 1)))))) (cl-find-if #'(lambda (s) (thread-last (substring s 0 1) (string= "*"))))))
(branch-name (if (null branch-name) nil (branch-name (thread-last
(substring branch-name 2)))) (substring branch-name 2)
(cond (if (null branch-name) nil))))
((null branch-name) nil) (if branch-name
((string= "(" (substring branch-name 0 1)) (ep/--abbreviate-str
(replace-regexp-in-string (cond
"\n$" "" ((string= "(" (substring branch-name 0 1))
(shell-command-to-string "git rev-parse --short HEAD"))) (replace-regexp-in-string
(t branch-name)))) "\n$" ""
(shell-command-to-string "git rev-parse --short HEAD")))
(t branch-name))
"-"
ep/git-branch-max-len))))
(defun ep/--git-status () (defun ep/--pwd ()
"Returns a completely formatted string of form (let ((pwd (thread-last (eshell/pwd)
BRANCH-NAME(REMOTE-STATUS)(CHANGES)." tramp-file-local-name
(let ((git-branch (ep/--git-branch-name))) abbreviate-file-name)))
(if (null git-branch) (ep/--abbreviate-str pwd "/" ep/pwd-max-len)))
""
(format
"%s(%s)(%s)"
(ep/--with-fg-colour git-branch ep/branch-name-colour)
(ep/--git-remote-status)
(ep/--git-change-status)))))
(defun ep/--user-and-remote () (defun ep/--abbreviate-str (to-abbrev sep max-len)
"If in a remote directory, return a string representing that host, (if (<= (length to-abbrev) max-len)
otherwise empty string." to-abbrev
(if (file-remote-p default-directory) (let ((str "")
(let ((user (file-remote-p default-directory 'user)) (len (length to-abbrev))
(host (file-remote-p default-directory 'host))) (components (split-string to-abbrev sep)))
(concat (while (and (> len max-len)
(if user (cdr components))
(format "%s@%s" user host) (let* ((comp (car components))
host) (ab-comp (cond
":")) ((= 0 (length comp)) "")
"")) ((= 1 (length comp)) comp)
((char-equal (elt comp 0) ?.)
(substring comp 0 3))
(t
(substring comp 0 2)))))
(setq str (concat str ab-comp sep)
len (- len (length ab-comp))
components (cdr components))))
(thread-last
components
(cl-reduce #'(lambda (a b) (concat a sep b)))
(if (null components) "")
(concat str)))))
(provide 'eshell-prompt) (provide 'eshell-prompt)
;;; eshell-prompt.el ends here ;;; eshell-prompt.el ends here