[emacs] Update 2 drones

[~bandali/configs] / init.org

diff --git a/init.org b/init.org
index 9c64204..7c49ca2 100644 (file)
--- a/init.org
+++ b/init.org
@@ -244,7 +244,6 @@ can then be managed with the help of Magit or other tools.
    ("C-c b a" . borg-assimilate)
    ("C-c b b" . borg-build)
    ("C-c b c" . borg-clone)
    ("C-c b a" . borg-assimilate)
    ("C-c b b" . borg-build)
    ("C-c b c" . borg-clone)

-   ("C-c b m" . borg-insert-update-message)

    ("C-c b r" . borg-remove)))
 #+end_src
 
    ("C-c b r" . borg-remove)))
 #+end_src
 


@@ -1016,7 +1015,10 @@ Not just how I do git, but /the/ way to do git.
 #+begin_src emacs-lisp
 (use-package magit
   :defer 1
 #+begin_src emacs-lisp
 (use-package magit
   :defer 1

-  :general (amin--leader-keys "g s" 'magit-status)
+  :general
+  (amin--leader-keys
+    "g s" 'magit-status
+    "g l" 'magit-log-buffer-file)

   :bind ("s-g" . magit-status)
   :config
   (magit-add-section-hook 'magit-status-sections-hook
   :bind ("s-g" . magit-status)
   :config
   (magit-add-section-hook 'magit-status-sections-hook


@@ -2009,7 +2011,47 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
   :hook (text-mode . typo-mode))
 #+end_src
 
   :hook (text-mode . typo-mode))
 #+end_src
 

-** slack
+** hl-todo
+
+#+begin_src emacs-lisp
+(use-package hl-todo
+  :defer 4
+  :config
+  (global-hl-todo-mode))
+#+end_src
+
+** shrink-path
+
+#+begin_src emacs-lisp
+(use-package shrink-path
+  :after eshell
+  :config
+  (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
+        eshell-prompt-function #'+eshell/prompt)
+
+  (defun +eshell/prompt ()
+    (let ((base/dir (shrink-path-prompt default-directory)))
+      (concat (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-face)
+              ;; 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))
+        ""))))
+#+end_src
+
+** COMMENT slack                                                   :ARCHIVE:

 
 Hopefully temporary.
 
 
 Hopefully temporary.
 


@@ -2074,47 +2116,7 @@ Hopefully temporary.
   (setq alert-default-style 'notifier))
 #+end_src
 
   (setq alert-default-style 'notifier))
 #+end_src
 

-** hl-todo
-
-#+begin_src emacs-lisp
-(use-package hl-todo
-  :defer 4
-  :config
-  (global-hl-todo-mode))
-#+end_src
-
-** shrink-path
-
-#+begin_src emacs-lisp
-(use-package shrink-path
-  :after eshell
-  :config
-  (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
-        eshell-prompt-function #'+eshell/prompt)
-
-  (defun +eshell/prompt ()
-    (let ((base/dir (shrink-path-prompt default-directory)))
-      (concat (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-face)
-              ;; 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))
-        ""))))
-#+end_src
-
-** magithub
+** COMMENT magithub                                                :ARCHIVE:

 
 For when I /have to/ use GH.
 
 
 For when I /have to/ use GH.