Emacs changes... lots of them

Emacs/.config/emacs/elisp/better-mode-line.el

@@ -67,8 +67,8 @@ extreme end to CENTRE-SEGMENT."
                   (:eval (bml/--generate-padding
                           bml/left-segment))
                   ,bml/centre-segment
-                  (:eval (bml/--generate-padding
-                          bml/right-segment))
+                  ;; NOTE: Emacs 30!
+                  mode-line-format-right-align
                   ,bml/right-segment)))
 
 (provide 'better-mode-line)

Emacs/.config/emacs/elisp/eshell-additions.el

@@ -55,9 +55,7 @@ Uses tramp to figure out if we're in sudo mode or not.  "
       (let ((wrapped-dir (concat "/sudo::" default-directory)))
         (eshell/cd wrapped-dir)))
      ((string= user "root")
-      (thread-last 'localname
-                   (file-remote-p default-directory)
-                   eshell/cd)))))
+      (eshell/cd (file-remote-p default-directory 'localname))))))
 
 ;; Additional functions
 (defun +eshell/at-cwd (&optional arg)
@@ -80,6 +78,19 @@ Pass argument to `+eshell/open'."
            collect
            (cons (buffer-name buffer) buffer)))
 
+(defun +eshell/--choose-instance ()
+  (let* ((current-instances (+eshell/--current-instances))
+         (answer (completing-read "Enter name: " (mapcar #'car current-instances)))
+         (result (assoc answer current-instances)))
+    (cond
+     (result (switch-to-buffer (cdr result))
+             (cdr result))
+     ((not (string= answer ""))
+      (let ((eshell-buffer-name (format "*%s-eshell*" answer)))
+        (eshell nil)))
+     (t
+      (eshell)))))
+
 (defun +eshell/open (&optional arg)
   "Open an instance of EShell, displaying it.
 
@@ -89,35 +100,28 @@ Otherwise, create an instance with the name given.
 
 If `arg' is non nil, then always prompt user to select an instance."
   (interactive "P")
-  (let ((current-instances (+eshell/--current-instances))
-        (buffer nil))
-    (cond
-     ((and (null current-instances)
-           (null arg))
-      (setq buffer (eshell)))
-     ((and (= (length current-instances) 1)
-           (null arg))
-      (setq buffer (cdar current-instances))
-      (switch-to-buffer (cdar current-instances)))
-     (t
-      (let* ((answer (completing-read "Enter name: " (mapcar #'car current-instances)))
-             (result (assoc answer current-instances)))
-        (cond
-         (result (switch-to-buffer (cdr result))
-                 (setq buffer (cdr result)))
-         ((not (string= answer ""))
-          (let ((eshell-buffer-name (format "*%s-eshell*" answer)))
-            (setq buffer (eshell nil))))
-         (t
-          (setq buffer (eshell)))))))
-    (if (and (consp arg) (> (car arg) 4))
-        (with-current-buffer buffer
-          (thread-last (read-file-name "Enter directory: ")
-                       file-name-directory
-                       list
-                       eshell/cd)
-          (eshell-send-input)))
-    buffer))
+  (cond
+   ((null arg)
+    ;; No arg => Choose a default instance
+    (let* ((candidates (+eshell/--current-instances))
+           (default-cand (assoc "*eshell*" candidates #'string=))
+           (vacuous-cand (car candidates)))
+      (if-let ((cand (or default-cand vacuous-cand)))
+          (switch-to-buffer (cdr cand))
+        (eshell))))
+   ((= (car arg) 4)
+    ;; Arg => Choose an instance
+    (+eshell/--choose-instance))
+   (t
+    ;; Double arg => Choose an instance then choose the directory
+    (let ((instance (+eshell/--choose-instance)))
+      (with-current-buffer instance
+        (thread-last (read-file-name "Enter directory: ")
+                     file-name-directory
+                     list
+                     eshell/cd)
+        (eshell-send-input))
+      instance))))
 
 (provide 'eshell-additions)
 ;;; eshell-additions.el ends here

Emacs/.config/emacs/elisp/eshell-prompt.el

@@ -28,13 +28,41 @@
   "Prompt for user to input.")
 
 (defvar ep/dir-colour "deepskyblue")
-(defvar ep/success-colour "forestgreen")
+(defvar ep/success-colour "green2")
 (defvar ep/failure-colour "red")
 (defvar ep/branch-name-colour "LightSalmon")
-(defvar ep/pipe-colour "green2")
+(defvar ep/pipe-colour "green4")
 (defvar ep/ahead-colour "dodger blue")
 (defvar ep/remote-colour "DarkGoldenrod")
 
+(defun ep/make-prompt ()
+  (let ((git (ep/--git-status)))
+    (thread-last
+      `(("┌──" :foreground ,ep/pipe-colour)
+        "["
+        (,(ep/--user-and-remote) :foreground ,ep/remote-colour)
+        (,(abbreviate-file-name (tramp-file-local-name (eshell/pwd)))
+         :foreground ,ep/dir-colour)
+        ,(if (string= git "")
+             ""
+           (concat "]─[" git))
+        "]"
+        "\n"
+        ("└─>" :foreground ,ep/pipe-colour)
+        (,ep/user-prompt :foreground ,(ep/--colour-on-last-command)))
+      (mapconcat
+       #'(lambda (item)
+           (if (listp item)
+               (propertize (car item)
+                           'font-lock-face (cdr item)
+                           'front-sticky   '(font-lock-face read-only)
+                           'rear-nonsticky '(font-lock-face read-only))
+             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 ()
   "Returns an Emacs colour based on ESHELL-LAST-COMMAND-STATUS."
   (if (zerop eshell-last-command-status)
@@ -57,38 +85,58 @@ behind or ahead the local repository is."
          (status (nth 3 branch-status))
          (diff (cl-position "by" branch-status :test #'string=)))
     (if (null diff)
-        (propertize "=" 'font-lock-face `(:foreground ,ep/success-colour))
+        (ep/--with-fg-colour "=" ep/success-colour)
       (let ((n (nth (+ 1 diff) branch-status)))
         (concat
          (cond
           ((string= status "ahead")
-           (propertize "→" 'font-lock-face `(:foreground ,ep/ahead-colour)))
+           (ep/--with-fg-colour "→" ep/ahead-colour))
           ((string= status "behind")
-           (propertize "←" 'font-lock-face `(:foreground ,ep/failure-colour))))
+           (ep/--with-fg-colour "←" ep/failure-colour)))
          n)))))
 
 (defun ep/--git-change-status ()
   "Returns a propertized string for the condition of the worktree in
-a repository.  If there are no changes i.e. the worktree is clean
-then a green tick is returned, but if there are changes then the
-number of files affected are returned in red."
+a repository.
+
+If there are no changes i.e. the worktree is clean then a green tick is
+returned.
+
+If there are changes then we characterise it by the following parameters:
+- staged changes in green
+- unstaged but tracked changes in blue
+- untracked files in red
+"
   (let* ((git-cmd "git status -s")
-         (command-output (split-string (shell-command-to-string git-cmd) "\n"))
-         (changed-files (- (length command-output) 1)))
-    (if (= changed-files 0)
-        (propertize "✓"
-                    'font-lock-face
-                    `(:foreground ,ep/success-colour))
-      (propertize (number-to-string changed-files)
-                  'font-lock-face
-                  `(:foreground ,ep/failure-colour)))))
+         (command-output
+          (thread-first (shell-command-to-string git-cmd)
+                        (split-string "\n")
+                        butlast))
+         (status-codes (mapcar #'(lambda (s) (cons (substring s 0 1) (substring s 1 2)))
+                          command-output))
+         (filter-f (lambda (x) (not (or (string= x "?") (string= x " ")))))
+         (total (length status-codes))
+         (staged (cl-count-if (lambda (x) (funcall filter-f (car x))) status-codes))
+         (modified (cl-count-if (lambda (x) (funcall filter-f (cdr x))) status-codes))
+         (not-tracked (cl-count-if (lambda (x) (string= (cdr x) "?")) status-codes)))
+    (if (= total 0)
+        (ep/--with-fg-colour "✓" ep/success-colour)
+      (thread-last
+        (list
+         (ep/--with-fg-colour (number-to-string staged) ep/success-colour)
+         (ep/--with-fg-colour (number-to-string modified) ep/ahead-colour)
+         (ep/--with-fg-colour (number-to-string not-tracked) ep/failure-colour))
+        (cl-remove-if #'(lambda (s) (string= s "0")))
+        (mapconcat #'(lambda (s) (concat s "/")))))))
 
 (defun ep/--git-branch-name ()
-  "Get the branch name of the current working directory.  W"
+  "Get the branch name of the current working directory.
+
+If a deteached head, return the SHA."
   (let* ((branch-name (thread-last
                         (split-string (shell-command-to-string "git branch") "\n")
-                        (cl-remove-if (lambda (s) (= (length s) 0)))
-                        (cl-find-if (lambda (s) (string= "*" (substring s 0 1))))))
+                        (cl-remove-if #'(lambda (s) (= (length s) 0)))
+                        (cl-find-if #'(lambda (s) (string= "*" (substring s 0 1))))))
          (branch-name (if (null branch-name) nil
                         (substring branch-name 2))))
     (cond
@@ -100,57 +148,33 @@ number of files affected are returned in red."
      (t branch-name))))
 
 (defun ep/--git-status ()
-  "Returns a completely formatted string of
-  form (BRANCH-NAME<CHANGES>[REMOTE-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)"
-       (propertize git-branch 'font-lock-face `(:foreground ,ep/branch-name-colour))
+       (ep/--with-fg-colour git-branch ep/branch-name-colour)
        (ep/--git-remote-status)
        (ep/--git-change-status)))))
 
 (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)))
-        (if user
-            (format "%s@%s " user host)
-          (concat host " ")))
+        (concat
+         (if user
+             (format "%s@%s" user host)
+           host)
+         ":"))
     ""))
 
-(defun ep/make-prompt ()
-  (let ((git (ep/--git-status)))
-    (mapconcat
-     (lambda (item)
-       (if (listp item)
-           (propertize (car item)
-                       'font-lock-face (cdr item)
-                       'front-sticky   '(font-lock-face read-only)
-                       'rear-nonsticky '(font-lock-face read-only))
-         item))
-     (list
-      `("┌──"
-        :foreground ,ep/pipe-colour)
-      "["
-      `(,(ep/--user-and-remote)
-        :foreground ,ep/remote-colour)
-      `(,(abbreviate-file-name (tramp-file-local-name (eshell/pwd)))
-        :foreground ,ep/dir-colour)
-      (if (string= git "")
-          ""
-        (concat "]─[" git))
-      "]"
-      "\n"
-      `("└─>"
-        :foreground ,ep/pipe-colour)
-      (list ep/user-prompt ':foreground (ep/--colour-on-last-command))))))
-
-
 (provide 'eshell-prompt)
 ;;; eshell-prompt.el ends here
 
 ;; Local Variables:
-;; read-symbol-shorthands: (("ep" . "+eshell-prompt"))
+;; read-symbol-shorthands: (("ep" . "eshell-prompt"))
 ;; End:

Emacs/.config/emacs/elisp/personal-solarized-theme.el

@@ -12,6 +12,7 @@
  '(child-frame-border ((t (:background "white"))))
  '(company-preview ((t (:foreground "wheat" :background "blue4"))))
  '(company-preview-common ((t (:inherit company-preview :foreground "grey"))))
+ '(company-template-field ((t (:inherit company-preview :foreground "grey" :slant italic))))
  '(company-tooltip ((t (:background "black" :foreground "white"))))
  '(company-tooltip-annotation ((t (:foreground "grey"))))
  '(company-tooltip-selection ((t (:background "grey31"))))

Emacs/.config/emacs/elisp/search.el

@@ -53,7 +53,7 @@ Returns a list of files with the directory preprended to them."
   (thread-last (+search/get-all-candidates)
                (cl-remove-if #'directory-name-p)
                (mapcar #'(lambda (x) (concat "\"" x "\" ")))
-               (string-join)))
+               string-join))
 
 (defun +search/search-all ()
   (interactive)
@@ -61,7 +61,7 @@ Returns a list of files with the directory preprended to them."
         (candidates (+search/-format-grep-candidates)))
     (thread-last candidates
                  (format "grep --color=auto -nIHZe \"%s\" -- %s" term)
-                 (grep))
+                 grep)
     (next-error)))
 
 (provide 'search)