[emacs/magit] auto-expand unmerged into upstream and recent commits

[~bandali/configs] / init.org

diff --git a/init.org b/init.org
index 9457e5f..b30aebc 100644 (file)
--- a/init.org
+++ b/init.org
@@ -649,10 +649,6 @@ Enable =winner-mode=.
 
 #+begin_src emacs-lisp
 (bind-keys
 
 #+begin_src emacs-lisp
 (bind-keys

- ("C-c F m" . make-frame-command)
- ("C-c F d" . delete-frame)
- ("C-c F D" . delete-other-frames)
-

  ("s-c e b" . eval-buffer)
  ("s-c e r" . eval-region)
 
  ("s-c e b" . eval-buffer)
  ("s-c e r" . eval-region)
 


@@ -727,7 +723,15 @@ customizing it.
 
   ;; fix tab and indentation in src blocks inside org-mode buffer
   ;; also see https://git.sr.ht/~bandali/dotfiles/commit/0e2ffd584aafdd4cf256bcdf2473f01c3aaaed55
 
   ;; fix tab and indentation in src blocks inside org-mode buffer
   ;; also see https://git.sr.ht/~bandali/dotfiles/commit/0e2ffd584aafdd4cf256bcdf2473f01c3aaaed55

-  (unbind-key "TAB" evil-motion-state-map))
+  (unbind-key "TAB" evil-motion-state-map)
+
+  (unbind-key "C-d" evil-insert-state-map)
+  (unbind-key "C-v" evil-insert-state-map)
+  (unbind-key "C-y" evil-insert-state-map)
+  (unbind-key "C-a" evil-insert-state-map)
+  (unbind-key "C-e" evil-insert-state-map)
+  (unbind-key "C-p" evil-insert-state-map)
+  (unbind-key "C-n" evil-insert-state-map))

 #+end_src
 
 #+begin_src emacs-lisp
 #+end_src
 
 #+begin_src emacs-lisp


@@ -747,6 +751,27 @@ customizing it.
   (push #'minibufferp evil-escape-inhibit-functions))
 #+end_src
 
   (push #'minibufferp evil-escape-inhibit-functions))
 #+end_src
 

+#+begin_src emacs-lisp
+(use-package evil-nerd-commenter
+  :after evil
+  :general
+  (nmap
+    "gc" 'evilnc-comment-operator
+    "gy" 'evilnc-copy-and-comment-lines))
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package evil-surround
+  :after evil
+  :general
+  (omap
+    "s" 'evil-surround-edit
+    "S" 'evil-Surround-edit)
+  (vmap
+    "S" 'evil-surround-region
+    "gS" 'evil-Surround-region))
+#+end_src
+

 #+begin_src emacs-lisp
 (amin--leader-keys
   "/"   '(:ignore t :wk "search")
 #+begin_src emacs-lisp
 (amin--leader-keys
   "/"   '(:ignore t :wk "search")


@@ -755,8 +780,19 @@ customizing it.
   "b k" 'kill-this-buffer
   "b s" 'save-buffer
 
   "b k" 'kill-this-buffer
   "b s" 'save-buffer
 

+  "e"   '(:ignore t :wk "eval")
+  "e b" 'eval-buffer
+  "e r" 'eval-region
+
+  "e e" 'shell-pop
+

   "f"   '(:ignore t :wk "files")
 
   "f"   '(:ignore t :wk "files")
 

+  "F"   '(:ignore t :wk "frames")
+  "F m" 'make-frame-command
+  "F d" 'delete-frame
+  "F D" 'delete-other-frames
+

   "h"   '(:ignore t :wk "help(ful)")
   "h c" 'describe-char
   "h f" 'describe-function
   "h"   '(:ignore t :wk "help(ful)")
   "h c" 'describe-char
   "h f" 'describe-function


@@ -771,6 +807,12 @@ customizing it.
 
   "w"   '(:ignore t :wk "window")
   "w o" 'other-window
 
   "w"   '(:ignore t :wk "window")
   "w o" 'other-window

+  "w 0" 'delete-window
+  "w 1" 'delete-other-windows
+  "w 2" 'split-window-below
+  "w 3" 'split-window-right
+  "w u" 'winner-undo
+  "w r" 'winner-redo

 
   "q"   '(:ignore t :wk "quit")
   "q q" 'save-buffers-kill-terminal)
 
   "q"   '(:ignore t :wk "quit")
   "q q" 'save-buffers-kill-terminal)


@@ -928,6 +970,10 @@ Not just how I do git, but /the/ way to do git.
                           'magit-insert-modules
                           'magit-insert-stashes
                           'append)
                           'magit-insert-modules
                           'magit-insert-stashes
                           'append)

+  (setq
+   magit-repository-directories '(("~/.emacs.d/" . 0)
+                                  ("~/src/git/" . 1)))
+  (push (cons [unpushed status] 'show) magit-section-initial-visibility-alist)

   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 


@@ -1655,8 +1701,10 @@ Emacs package that displays available keybindings in popup
     "f c" 'crux-copy-file-preserve-attributes
     "f d" 'crux-delete-file-and-buffer
     "f r" 'crux-rename-file-and-buffer)
     "f c" 'crux-copy-file-preserve-attributes
     "f d" 'crux-delete-file-and-buffer
     "f r" 'crux-rename-file-and-buffer)

-  :bind (("C-S-j"   . crux-top-join-line)
-         ("C-c j"   . crux-top-join-line)))
+  :bind (("C-c d" . crux-duplicate-current-line-or-region)
+         ("C-c D" . crux-duplicate-and-comment-current-line-or-region)
+         ("C-S-j" . crux-top-join-line)
+         ("C-c j" . crux-top-join-line)))

 #+end_src
 
 ** [[https://github.com/alezost/mwim.el][mwim]]
 #+end_src
 
 ** [[https://github.com/alezost/mwim.el][mwim]]


@@ -1857,6 +1905,9 @@ Hopefully temporary.
    :subscribed-channels '(general)
    :full-and-display-names t)
   (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)
    :subscribed-channels '(general)
    :full-and-display-names t)
   (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)

+  (setq lui-time-stamp-format "[%Y-%m-%d %H:%M:%S]"
+        lui-time-stamp-only-when-changed-p t
+        lui-time-stamp-position 'right)

   :bind
   (("C-c s s" . slack-start)
    ("C-c s u" . slack-select-unread-rooms)
   :bind
   (("C-c s s" . slack-start)
    ("C-c s u" . slack-select-unread-rooms)


@@ -1936,6 +1987,13 @@ For when I /have to/ use GH.
   (setq magithub-clone-default-directory "~/src/git"))
 #+end_src
 
   (setq magithub-clone-default-directory "~/src/git"))
 #+end_src
 

+** [[https://github.com/peterwvj/eshell-up][eshell-up]]
+
+#+begin_src emacs-lisp
+(use-package eshell-up
+  :after eshell)
+#+end_src
+

 * Email
 
 #+begin_src emacs-lisp
 * Email
 
 #+begin_src emacs-lisp


@@ -2040,6 +2098,8 @@ For when I /have to/ use GH.
            (body "\nBest,\namin\n"))
           ("gnu.*"
            (address "bandali@gnu.org"))
            (body "\nBest,\namin\n"))
           ("gnu.*"
            (address "bandali@gnu.org"))

+          ((header "subject" "ThankCRM")
+           (to "webmasters-comment@gnu.org"))

           ("nnimap\\+uwaterloo:.*"
            (address "abandali@uwaterloo.ca")
            (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
           ("nnimap\\+uwaterloo:.*"
            (address "abandali@uwaterloo.ca")
            (gcc "\"nnimap+uwaterloo:Sent Items\"")))))


@@ -2131,20 +2191,32 @@ Convenient footnotes in =message-mode=.
         ;; sc-cite-blank-lines-p t
         sc-citation-leader ""
         sc-reference-tag-string ""
         ;; sc-cite-blank-lines-p t
         sc-citation-leader ""
         sc-reference-tag-string ""

+        sc-preferred-header-style 5     ; (sc-header-author-writes)

         sc-auto-fill-region-p nil
         sc-confirm-always-p nil)
   :config
         sc-auto-fill-region-p nil
         sc-confirm-always-p nil)
   :config

-  (defun amin--sc-header ()
-    "Hi <firstname>,\n\n <from> writes:"
-    (let ((sc-mumble "")
-             (whofrom (sc-whofrom)))
-      (if whofrom
-             (insert (sc-hdr "Hi " (sc-mail-field "sc-firstname") ",\n\n")
-                  sc-reference-tag-string
-                         whofrom
-                         " writes:\n"))))
-  (add-to-list 'sc-rewrite-header-list '(amin--sc-header) t)
-  (setq sc-preferred-header-style (1- (length sc-rewrite-header-list)))
+  ;;   (defun amin--sc-header-on-wrote ()
+  ;;     "\"On <date>, <sc-author> wrote:\" unless:
+  ;; 1. the \"sc-author\" field cannot be found, in which case nothing is inserted;
+  ;; 2. the \"date\" field is missing in which case only the from part is printed."
+  ;;     (let ((sc-mumble "")
+  ;;         (whofrom (sc-whofrom)))
+  ;;       (if whofrom
+  ;;         (insert sc-reference-tag-string
+  ;;                     (sc-hdr "On " (sc-mail-field "date") ", ")
+  ;;                     (sc-hdr "" (sc-mail-field "sc-author")) " wrote:\n"))))
+  ;;   (defun amin--sc-header ()
+  ;;     "Hi <firstname>,\n\n <from> writes:"
+  ;;     (let ((sc-mumble "")
+  ;;         (whofrom (sc-whofrom)))
+  ;;       (if whofrom
+  ;;         (insert (sc-hdr "Hi " (sc-mail-field "sc-firstname") ",\n\n")
+  ;;                   sc-reference-tag-string
+  ;;                     whofrom
+  ;;                     " writes:\n"))))
+  ;; (add-to-list 'sc-rewrite-header-list '(amin--sc-header) t)
+  ;; (add-to-list 'sc-rewrite-header-list '(amin--sc-header-on-wrote) t)
+  ;; (setq sc-preferred-header-style (1- (length sc-rewrite-header-list)))

   (add-hook 'mail-citation-hook 'sc-cite-original))
 #+end_src
 
   (add-hook 'mail-citation-hook 'sc-cite-original))
 #+end_src