meh

1 files changed, 120 insertions, 62 deletions

@@ -45,8 +45,9 @@
            "C-c v" #'visible-mode
            "C-M-;" #'+lisp-comment-or-uncomment-sexp
            "M-j" nil
-           "C-x o" (lambda () (interactive) (switch-to-buffer nil))
-           "C-x C-o" #'+open-paragraph
+           "C-x C-o" #'+switch-to-last-buffer
+           "C-x o" #'+switch-to-last-buffer
+           "C-x C-l" #'+open-paragraph  ; original: downcase-region
            "C-w" #'+kill-word-backward-or-region
            "C-x C-m" #'execute-extended-command  ; original: coding systems
            "C-<backspace>" #'+backward-kill-word
@@ -63,7 +64,7 @@
   ;; Hooks
   (add-hook 'prog-mode-hook #'turn-on-auto-fill)
   (add-hook 'prog-mode-hook #'font-lock-todo-insinuate)
-  (add-hook 'text-mode-hook #'turn-on-auto-fill)
+  (add-hook 'text-mode-hook #'turn-on-auto-fill) ; XXX: do I want this ??
   (add-hook 'special-mode-hook #'turn-off-auto-fill)
   ;; Advice
   (advice-add #'completing-read-multiple :filter-args #'+crm-indicator)
@@ -153,7 +154,7 @@
            save-abbrevs 'silent)
   (with-eval-after-load 'user-save
     (:with-mode edit-abbrevs-mode
-      (:hook #'turn-off-user-save-mode)))
+      (:hook #'user-save-mode-disable)))
   (:hook-into text-mode
               circe-chat-mode))
 
@@ -293,7 +294,8 @@
            dired-dwim-target t)
   (:local-set truncate-lines t)
   (:bind "<backspace>" #'dired-up-directory
-         "j" #'+dired-goto-file)
+         "j" #'+dired-goto-file
+         "C-j" #'dired-up-directory)
   (:hook #'dired-hide-details-mode
          #'hl-line-mode
          #'lin-mode
@@ -528,21 +530,33 @@
     (advice-add 'notmuch-tag :filter-args #'+notmuch-correct-tags)
     (:option notmuch-saved-searches (list
                                      (list :name "inbox"
-                                           :query (+notmuch-query-concat "tag:inbox"
-                                                                         "NOT tag:Spam")
+                                           :query (+notmuch-query-concat
+                                                   "tag:inbox"
+                                                   "tag:unread"
+                                                   "NOT tag:Spam")
                                            :key "i")
                                      (list :name "lists"
-                                           :query (+notmuch-query-concat "tag:/List/"
-                                                                         "tag:unread")
+                                           :query (+notmuch-query-concat
+                                                   "tag:/List/"
+                                                   "tag:unread")
                                            :key "l")
                                      (list :name "unread"
-                                           :query (+notmuch-query-concat "tag:unread"
-                                                                         "NOT tag:Spam")
+                                           :query (+notmuch-query-concat
+                                                   "tag:unread"
+                                                   "NOT tag:Spam")
                                            :key "u")
-                                     (list :name "flagged" :query "tag:flagged" :key "f")
-                                     (list :name "sent" :query "tag:sent" :key "t")
-                                     (list :name "drafts" :query "tag:draft" :key "d")
-                                     (list :name "all mail" :query "*" :key "a"))))
+                                     (list :name "flagged"
+                                           :query "tag:flagged"
+                                           :key "f")
+                                     (list :name "sent"
+                                           :query "tag:sent"
+                                           :key "t")
+                                     (list :name "drafts"
+                                           :query "tag:draft"
+                                           :key "d")
+                                     (list :name "all mail"
+                                           :query "*"
+                                           :key "a"))))
   (:+leader "m" #'+notmuch-goto "C-m" #'+notmuch-goto
             "n" #'notmuch "C-n" #'notmuch)
   ;; For `focus'
@@ -582,7 +596,7 @@
            org-confirm-babel-evaluate nil
            org-cycle-separator-lines 0
            org-directory (sync/ "org/" t)
-           org-ellipsis truncate-string-ellipsis
+           org-ellipsis (or truncate-string-ellipsis "…")
            org-fontify-done-headline t
            org-fontify-quote-and-verse-blocks t
            org-fontify-whole-heading-line t
@@ -614,7 +628,7 @@
            org-src-window-setup 'current-window
            org-startup-truncated nil
            org-startup-with-inline-images t
-           org-tags-column 1 ;; (- (- fill-column (length org-ellipsis)))
+           org-tags-column (- (- fill-column (length org-ellipsis)))
            org-todo-keywords '((sequence "TODO(t)" "WAIT(w@/!)" "ONGOING(o@)"
                                          "|" "DONE(d!)")
                                (sequence "|" "CANCELED(k@)")
@@ -672,7 +686,6 @@
               ;;                                       (let ((ch (string-to-char (car emph))))
               ;;                                         (cons ch ch)))
               ;;                                     org-emphasis-alist))
-              ;;+modeline-position-function #'+org-count-words-stupidly
               )
   (:local-hook user-save-hook #'+org-before-save@prettify-buffer)
   (advice-add #'org-delete-backward-char :override #'+org-delete-backward-char)
@@ -920,6 +933,11 @@
             (widen)
             (string-equal (buffer-substring 1 10) ";; Emacs:")))))))
 
+(setup whitespace
+  (:option whitespace-line-column nil
+           whitespace-style '(face trailing tabs tab-mark))
+  (:hook-into text-mode prog-mode))
+
 (setup (:straight 0x0)
   (:option 0x0-default-server 'ttm)
   (with-eval-after-load 'embark
@@ -986,7 +1004,8 @@
   (:bind-into isearch
     "M-j" #'avy-isearch)
   (:when-loaded
-    (setf (alist-get ?. avy-dispatch-alist) #'avy-action-embark)))
+    (setf (alist-get ?. avy-dispatch-alist) #'avy-action-embark)
+    (+avy-buffer-face-mode +1)))
 
 (setup (:straight bbdb)
   (:straight bbdb-vcard)
@@ -1228,7 +1247,8 @@
     (:hook #'visual-line-mode
            #'enable-lui-track
            #'visual-fill-column-mode
-           #'enable-lui-autopaste)
+           #'enable-lui-autopaste
+           )
     (:local-set fringes-outside-margins t
                 right-margin-width (length lui-time-stamp-format)
                 scroll-margin 0
@@ -1478,8 +1498,9 @@
 (setup (:straight edit-server)
   (:option edit-server-url-major-mode-alist `(("github\\.com" . ,(if (fboundp 'gfm-mode)
                                                                      #'gfm-mode
-                                                                   #'markdown-mode))))
-  (add-hook 'edit-server-done-hook (lambda () (unfill-region (point-min) (point-max))))
+                                                                   #'markdown-mode))
+                                              ("reddit\\.com" . markdown-mode)
+                                              ("notabug\\.org" . markdown-mode)))
   (+with-ensure-after-init
     (edit-server-start)))
 
@@ -1643,6 +1664,7 @@
 (setup (:straight (fill-sentences-correctly
                    :host github
                    :repo "duckwork/fill-sentences-correctly.el"))
+  (:quit "I don't think this works like how I want.")
   (fill-sentences-correctly-mode +1))
 
 (setup (:straight (filldent
@@ -2034,41 +2056,59 @@
                 "Prog-mode major mode face.")
               (modus-themes-with-colors
                 (custom-set-faces
-                 `(font-lock-builtin-face ((,class :inherit modus-themes-bold
-                                                   :foreground unspecified)))
-                 `(font-lock-comment-delimiter-face ((,class :inherit font-lock-comment-face)))
-                 `(font-lock-comment-face ((,class :inherit variable-pitch
-                                                   :slant italic
-                                                   :foreground ,fg-docstring)))
-                 `(font-lock-constant-face ((,class :inherit underline
-                                                    :foreground unspecified)))
-                 `(font-lock-doc-face ((,class :inherit modus-themes-slant
-                                               :foreground ,fg-docstring)))
-                 `(font-lock-function-name-face ((,class :foreground unspecified)))
-                 `(font-lock-keyword-face ((,class :inherit modus-themes-bold
-                                                   :foreground unspecified)))
-                 `(font-lock-negation-char-face ((,class :inherit modus-themes-bold
-                                                         :foreground unspecified)))
-                 `(font-lock-preprocessor-face ((,class :foreground unspecified)))
-                 `(font-lock-regexp-grouping-backslash ((,class :foreground ,fg-escape-char-backslash)))
-                 `(font-lock-regexp-grouping-construct ((,class :foreground ,fg-escape-char-construct)))
-                 `(font-lock-string-face ((,class :inherit modus-themes-slant
-                                                  :foreground unspecified)))
-                 `(font-lock-type-face ((,class :inherit modus-themes-bold
-                                                :foreground unspecified)))
-                 `(font-lock-variable-name-face ((,class :foreground unspecified)))
-                 `(font-lock-warning-face ((,class :inherit modus-themes-bold
-                                                   :foreground ,red-nuanced-fg)))
-                 `(font-lock-todo-face ((,class :inherit font-lock-comment-face
-                                                :foreground ,fg-header
-                                                :background ,yellow-intense-bg)))
-                 `(+modeline-text-mode-face ((,class :foreground ,blue
-                                                     :inherit modus-themes-bold)))
-                 `(+modeline-prog-mode-face ((,class :foreground ,magenta
-                                                     :inherit modus-themes-bold))))
-                (:option +modeline-major-mode-faces `((text-mode . +modeline-text-mode-face)
-                                                      (prog-mode . +modeline-prog-mode-face)
-                                                      (t . bold))))))
+                 `(font-lock-builtin-face
+                   ((,class :inherit modus-themes-bold
+                            :foreground unspecified)))
+                 `(font-lock-comment-face
+                   ((,class :inherit variable-pitch
+                            :foreground ,fg-comment-yellow)))
+                 `(font-lock-comment-delimiter-face
+                   ((,class :inherit font-lock-comment-face)))
+                 `(font-lock-constant-face
+                   ((,class :inherit underline
+                            :foreground unspecified)))
+                 `(font-lock-doc-face
+                   ((,class :inherit modus-themes-slant
+                            :foreground ,fg-docstring)))
+                 `(font-lock-function-name-face
+                   ((,class :foreground unspecified
+                            :slant italic)))
+                 `(font-lock-keyword-face
+                   ((,class :inherit modus-themes-bold
+                            :foreground unspecified)))
+                 `(font-lock-negation-char-face
+                   ((,class :inherit modus-themes-bold
+                            :foreground unspecified)))
+                 `(font-lock-preprocessor-face
+                   ((,class :foreground unspecified)))
+                 `(font-lock-regexp-grouping-backslash
+                   ((,class :foreground ,fg-escape-char-backslash)))
+                 `(font-lock-regexp-grouping-construct
+                   ((,class :foreground ,fg-escape-char-construct)))
+                 `(font-lock-string-face
+                   ((,class :foreground ,fg-special-warm)))
+                 `(font-lock-type-face
+                   ((,class :inherit modus-themes-bold
+                            :foreground unspecified)))
+                 `(font-lock-variable-name-face
+                   ((,class :foreground unspecified)))
+                 `(font-lock-warning-face
+                   ((,class :inherit modus-themes-bold
+                            :foreground ,red-nuanced-fg)))
+                 `(font-lock-todo-face
+                   ((,class :inherit font-lock-comment-face
+                            :foreground ,fg-header
+                            :background ,yellow-intense-bg)))
+                 `(+modeline-text-mode-face
+                   ((,class :foreground ,blue
+                            :inherit modus-themes-bold)))
+                 `(+modeline-prog-mode-face
+                   ((,class :foreground ,magenta
+                            :inherit modus-themes-bold))))
+                (:option +modeline-major-mode-faces
+                         `((text-mode . +modeline-text-mode-face)
+                           (prog-mode . +modeline-prog-mode-face)
+                           (t . bold))))))
 
   (require 'dawn)
   (dawn-schedule #'modus-themes-load-operandi
@@ -2235,10 +2275,22 @@
 (setup (:straight pdf-tools
          (or (executable-find "gcc")
              (executable-find "g++")))
+  (:also-load +pdf-tools)
+  (:with-mode pdf-view-mode
+    (:local-set +modeline-position-function #'+pdf-view-position))
   (setf (alist-get "\\.pdf\\'" auto-mode-alist nil nil #'equal)
         #'pdf-view-mode)
   (pdf-tools-install :no-query))
 
+(setup (:straight persistent-scratch)
+  (:require)
+  (:option persistent-scratch-save-file (sync/ "emacs/scratch")
+           persistent-scratch-backup-directory (sync/ "emacs/scratch.d/" t)
+           persistent-scratch-backup-file-name-format "%Y-%m-%dT%H:%M_%s")
+  (persistent-scratch-autosave-mode +1)
+  (+mapc-some-buffers (lambda () (persistent-scratch-mode +1))
+                      persistent-scratch-scratch-buffer-p-function))
+
 (setup (:straight (plancat
                    :host github
                    :repo "duckwork/plancat.el"
@@ -2310,7 +2362,7 @@
                   +modeline-narrowed
                   +modeline-text-scale
                   +modeline-input-method)
-                ",")
+                " ")
               +modeline-major-mode
               +modeline-spacer)))
   (simple-modeline-mode +1))
@@ -2356,12 +2408,14 @@
    #'view-hello-file
    #'describe-gnu-project
    #'suspend-frame)
+  (sophomore-disable-with 'confirm
+    #'+save-buffers-quit
+    #'save-buffers-kill-terminal)
   (sophomore-mode +1))
 
 (setup (:straight (spongebob-case
                    :host github
-                   :repo "duckwork/spongebob-case.el"))
-  (define-key +casing-map (kbd "M-s") #'spongebob-case-dwim))
+                   :repo "duckwork/spongebob-case.el")))
 
 (setup (:straight ssh-config-mode)
   (:file-match (rx "/.ssh/config" eos)
@@ -2388,10 +2442,12 @@
                    :host github
                    :repo "duckwork/titlecase.el"
                    :files ("*")))
-  (:require titlecase)
+  (:require titlecase +titlecase)
   (:with-map +casing-map
     (:bind "t" #'titlecase-dwim
-           "M-t" #'titlecase-dwim)))
+           "M-t" #'titlecase-dwim
+           "s" #'+titlecase-sentence-style-dwim
+           "M-s" #'+titlecase-sentence-style-dwim)))
 
 (setup (:straight topsy)
   (:hook-into ;;prog-mode
@@ -2448,6 +2504,8 @@
                    :host github
                    :repo "casouri/undo-hl"))
   (:require)
+  (:face 'undo-hl-delete '((t :strikethrough t))
+         'undo-hl-insert '((t :underline t)))
   (:hook-into text-mode prog-mode))
 
 (setup (:straight unfill))