4 files changed, 76 insertions, 52 deletions

@@ -3,20 +3,6 @@
 ;; Copyright (C) 2021  Case Duckworth
 
 ;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")>
-;; Keywords: 
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -26,6 +12,8 @@
 ;;; Code:
 
 (require 'setup)
+(require 'eshell)
+(require 'em-alias)
 
 ;;; Environment
 (setenv "PAGER" "cat")
@@ -52,8 +40,8 @@
 (setup (:straight eshell-syntax-highlighting)
   (eshell-syntax-highlighting-global-mode +1))
 
-(setup (:straight-if fish-completion
-                     (executable-find "fish"))
+(setup (:straight-when fish-completion
+         (executable-find "fish"))
   (:autoload global-fish-completion-mode)
   (global-fish-completion-mode +1))
 
@@ -63,8 +51,5 @@
 (when (boundp 'simple-modeline--mode-line)
   (setq mode-line-format '(:eval simple-modeline--mode-line)))
 
-;;; Tell Emacs our customizations are loaded.
-(defvar eshell-customizations-loaded t
-  "Whether eshell's customizations have been loaded yet.")
-
+(provide 'eshellrc)
 ;;; eshell.el ends here
@@ -441,12 +441,10 @@
   (:local-set outline-regexp eshell-prompt-regexp
               page-delimiter eshell-prompt-regexp)
 
-  (:bind "C-d" #'eshell-quit-or-delete-char)
-
   (:hook #'eshell-arg-hist-mode
          (defun eshell-mode@setup ()
-           (unless (bound-and-true-p eshell-customizations-loaded)
-             (load (expand-file-name "eshell" user-emacs-directory))))))
+           (require 'eshellrc (locate-user-emacs-file "eshell") :noerror)
+           (:bind "C-d" #'eshell-quit-or-delete-char))))
 
 (setup eww
   (:also-load acdw-eww)
@@ -675,9 +673,6 @@ specific to most general, they are these:
   ;; <anything> -> mouse-1 /always/ follows link
   (:option mouse-1-click-follows-link t))
 
-(setup mouse-avoidance
-  (mouse-avoidance-mode 'banish))
-
 (setup page
   (:option page-delimiter
            (rx bol (or "\f" ";;;")
@@ -1067,8 +1062,9 @@ specific to most general, they are these:
   (with-eval-after-load 'circe
     (:face circe-nick-highlight-face
            ((t (:inherit (modus-themes-hl-line modus-themes-bold))))
-           circe-my-message-face
-           ((t (:inherit (modus-themes-slant))))))
+           ;; circe-my-message-face
+           ;; ((t (:inherit (modus-themes-slant))))
+           ))
   
   (:bind "C-c C-p" #'circe-command-PART
          "C-l" #'lui-track-jump-to-indicator
@@ -1219,7 +1215,7 @@ specific to most general, they are these:
 
 (setup (:straight crux)
   (:global "C-o" #'crux-smart-open-line
-           "M-o" #'crux-smart-open-line-above
+           "M-o" #'open-paragraph
            "C-M-\\" #'crux-cleanup-buffer-or-region
            "C-x 4 t" #'crux-transpose-windows)
 
@@ -1917,7 +1913,7 @@ browser defined in `browse-url-secondary-browser-function'."
            org-clock-clocked-in-display 'mode-line
            org-clock-frame-title-format (cons '(t org-mode-line-string)
                                               (cons " --- " frame-title-format))
-           ;;org-clock-string-limit 7             ; gives time and not title
+           org-clock-string-limit 25    ; gives enough information
            org-clock-persist t
            org-confirm-babel-evaluate nil
            org-cycle-separator-lines 0
@@ -1964,12 +1960,24 @@ browser defined in `browse-url-secondary-browser-function'."
   (:unbind "C-j"                        ; org-return-and-maybe-indent
            "M-j")
 
-  (:local-set unfill-fill-function #'org-fill-paragraph)
+  (:local-set unfill-fill-function #'org-fill-paragraph
+              wc-count-words-function
+              (lambda (start end) "Count words stupidly with a limit."
+                (acdw-org/count-words-stupidly start
+                                               end
+                                               999)))
   
   (with-eval-after-load 'org-export
     (:option (append org-export-filter-final-output-functions)
              #'org-export-remove-zero-width-spaces))
 
+  (:local-hook before-save-hook
+               (defun org/before-save@fix-blank-lines ()
+                 (acdw-org/fix-blank-lines t))
+               before-save-hook
+               (defun org/before-save@align-tags ()
+                 (org-align-tags :all)))
+  
   (:hook ;; #'variable-pitch-mode
 
    ;; (defun org-mode@before-save@fill-buffer ()
@@ -1981,22 +1989,23 @@ browser defined in `browse-url-secondary-browser-function'."
    ;; This is super ugly because I need to add a function to
    ;; `before-save-hook', but only in org-mode buffers.  So I make a hook
    ;; to make a hook.  I'm sure there's a better way to do this.
-   (defun org-mode@fix-blank-lines-on-save ()
-     (add-hook 'before-save-hook
-               (defun acdw-org/fix-blank-lines-in-buffer ()
-                 (acdw-org/fix-blank-lines t))
-               0 :local))
+   ;; (defun org-mode@fix-blank-lines-on-save ()
+   ;;   (add-hook 'before-save-hook
+   ;;             (defun acdw-org/fix-blank-lines-in-buffer ()
+   ;;               (acdw-org/fix-blank-lines t))
+   ;;             0 :local))
    
-   (defun org-mode@wc-stupid ()
-     (unless (and wc-mode
-                  (> 0 (+ (or wc-orig-words 0)
-                          (or wc-words-delta 0)))))
-     (setq-local
-      wc-count-words-function
-      (lambda (start end) "Count words stupidly with a limit."
-        (acdw-org/count-words-stupidly start
-                                       end
-                                       999)))))
+   ;; (defun org-mode@wc-stupid ()
+   ;;   (unless (and wc-mode
+   ;;                (> 0 (+ (or wc-orig-words 0)
+   ;;                        (or wc-words-delta 0)))))
+   ;;   (setq-local
+   ;;    wc-count-words-function
+   ;;    (lambda (start end) "Count words stupidly with a limit."
+   ;;      (acdw-org/count-words-stupidly start
+   ;;                                     end
+   ;;                                     999))))
+   )
 
   (with-eval-after-load 'org
     (org-clock-persistence-insinuate))
@@ -2312,8 +2321,11 @@ the default is \"/\"."
               (list
                (propertize " "
                            'display
-                           '((space :align-to 
-                                    ,(unless visual-fill-column-mode 0))))
+                           '((space
+                              :align-to 
+                              ,(unless
+                                   (bound-and-true-p visual-fill-column-mode)
+                                 0))))
                (funcall topsy-fn))))))
 
 (setup (:straight trashed)
@@ -2409,7 +2421,15 @@ If used with a numeric prefix argument N, N backticks will be inserted."
                (setq-local indicate-empty-lines nil
                            indicate-buffer-boundaries nil)
              (acdw/setup-fringes))))
-  (:advise text-scale-adjust :after #'visual-fill-column-adjust))
+  (:advise text-scale-adjust :after #'visual-fill-column-adjust)
+  ;; Fix bindings
+  (when (bound-and-true-p mouse-wheel-mode)
+    (with-eval-after-load 'visual-fill-column
+      (dolist (margin '(right-margin left-margin))
+        (dolist (event '(wheel-down wheel-up))
+          (define-key visual-fill-column-mode-map
+            (vector margin event)
+            #'mwheel-scroll))))))
 
 (setup (:straight visual-regexp)
   (:global "M-%" #'vr/query-replace))
@@ -862,6 +862,23 @@ When called with PREFIX, just kill Emacs without confirmation."
                  (let ((b (get-buffer (if (consp b) (car b) b))))
                    (member (buffer-local-value 'major-mode b) modes)))))
     (pop-to-buffer (read-buffer "Buffer: " nil t pred))))
+
+;;; BLAH
+
+(defun open-paragraph ()
+  "Open a paragraph after point.
+A paragraph is defined as continguous non-empty lines of text
+surrounded by empty lines, so opening a paragraph means to make
+three blank lines, then place the point on the second one."
+  (interactive)
+  ;; Go to next blank line.  This /isn't/ `end-of-paragraph-text' because
+  ;; that's weird with org, and I'm guessing other modes too.
+  (while (not (looking-at "^$"))
+    (forward-line 1))
+  (newline)
+  (delete-blank-lines)
+  (newline 2)
+  (previous-line))
 
 (provide 'acdw)
 ;;; acdw.el ends here
@@ -40,10 +40,12 @@
     (org-back-to-heading)
     (org-open-at-point)))
 
+(defun chd/click-bits (date)
+  "Create a new Click Bits org file, or edit the one for DATE."
+  (error "not implemented"))
+
 ;;; NOTES
 ;; org-protocol: https://orgmode.org/worg/org-contrib/org-protocol.html
 ;; the bit i wanna pull from TaskIQ: 'document.getElementById("preview")
-
-
 (provide 'chd)
 ;;; chd.el ends here