Merge branch 'main' of https://tildegit.org/acdw/emacs into 5c

4 files changed, 152 insertions, 56 deletions

@@ -77,7 +77,7 @@
         (left-fringe . 8)               ; Width of fringes
         (right-fringe . 8)              ; (8 is default)
         (font . ,(pcase acdw/system
-                   (:home "Terminus 12")
+                   (:home "DejaVu Sans Mono 10")
                    (:work "Consolas 10"))))
         frame-inhibit-implied-resize t  ; Don't resize randomly
         frame-resize-pixelwise t        ; Resize by pixels, not chars
@@ -160,3 +160,11 @@
            gcs-done))
 
 (add-hook 'emacs-startup-hook #'hook--message-startup-time)
+
+;;; Install `no-littering', pointing both directories at `acdw/dir'.  This will
+;;; take care of the packages I don't care about configuring.
+
+(straight-use-package 'no-littering)
+(setq no-littering-etc-directory acdw/dir
+      no-littering-var-directory acdw/dir)
+(require 'no-littering)
@@ -258,6 +258,9 @@
 (when (require 'imenu)
   (acdw/set '((imenu-auto-rescan t))))
 
+;; Fonts
+(acdw/set-faces ((fixed-pitch . ((t (:inherit default))))))
+
 ;;; Packages
 
 ;; Undo-fu
@@ -283,68 +286,39 @@
          (modus-themes-scale-headings nil)
          (modus-themes-mode-line nil))
   :now ((acdw/sunrise-sunset #'modus-themes-load-operandi
-                             #'modus-themes-load-vivendi)))
+                             #'modus-themes-load-vivendi)
+        ;; for june
+        (global-font-lock-mode -1)))
+
+;; Expand-region
+(acdw/pkg expand-region
+  :binds (("C-=" er/expand-region)))
+
+;;; Frame title
+
+(acdw/set `((frame-title-format
+             "%b %+%* GNU Emacs")))
 
 ;;; Mode line
 
 ;; Minions
-(acdw/pkg minions
-  :now ((minions-mode +1)))
+(acdw/pkg minions)
 
 ;; Simple mode line
 (acdw/pkg simple-modeline
   :set '((simple-modeline-segments
           ((;; left
-            acdw/modeline-modified
-            simple-modeline-segment-buffer-name
-            simple-modeline-segment-position)
+            acdw-modeline/modified
+            acdw-modeline/buffer-name
+            simple-modeline-segment-position
+            simple-modeline-segment-word-count)
            (;; right
-            simple-modeline-segment-vc
+            acdw-modeline/vc-branch
             simple-modeline-segment-misc-info
             simple-modeline-segment-process
-            acdw/modeline-minions
+            acdw-modeline/minions
             simple-modeline-segment-major-mode))))
-  :now ((defun acdw/modeline-modified ()
-          "Displays a color-coded buffer modification/read-only
-indicator in the mode-line."
-          (if (not (string-match-p "\\*.*\\*" (buffer-name)))
-              (let* ((read-only (and buffer-read-only (buffer-file-name)))
-                     (modified (buffer-modified-p)))
-                (propertize
-                 (if read-only " ×" (if modified " ●" " ○"))
-                 'face `(:inherit
-                         ,(if modified 'simple-modeline-status-modified
-                            (if read-only 'simple-modeline-status-error
-                              'simple-modeline-unimportant)))
-                 'help-echo (format
-                             (concat "Buffer is %s and %smodified\n"
-                                     "mouse-1: Toggle read-only status.")
-                             (if read-only "read-only" "writable")
-                             (if modified "" "not "))
-                 'local-map (purecopy (simple-modeline-make-mouse-map
-                                       'mouse-1
-                                       (lambda (event)
-                                         (interactive "e")
-                                         (with-selected-window
-                                             (posn-window (event-start event))
-                                           (read-only-mode 'toggle)))))
-                 'mouse-face 'mode-line-highlight))))
-        (defun acdw/modeline-minions ()
-          "Display a button for `minions-minor-modes-menu'."
-          (concat
-           " "
-           (propertize
-            "ⱷ"
-            'help-echo (format
-                        "Minor modes menu\nmouse-1: show menu.")
-            'local-map (purecopy (simple-modeline-make-mouse-map
-                                  'mouse-1
-                                  (lambda (event)
-                                    (interactive "e")
-                                    (with-selected-window (posn-window
-                                                           (event-start event))
-                                      (minions-minor-modes-menu)))))
-            'mouse-face 'mode-line-highlight)))
+  :now ((require 'acdw-modeline)
         (simple-modeline-mode +1)))
 
 ;;; Magit
@@ -416,7 +390,19 @@ indicator in the mode-line."
             (org-export-headline-levels 8)
             (org-export-with-smart-quotes t)
          (org-export-with-sub-superscripts t))
-  :hooks ((before-save-hook acdw/hook--org-mode-fix-blank-lines)))
+  :hooks ((before-save-hook acdw/hook--org-mode-fix-blank-lines))
+  :binds (("RET" unpackaged/org-return-dwim
+           :map org-mode-map :map-after 'org)))
+
+;;; Nov.el -- ebook reader
+(acdw/pkg nov
+  :now ((autoload #'nov-mode "nov")
+        (add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode)))
+  :set `((nov-text-width ,fill-column)))
+
+;;; 0x0 -- upload files
+(acdw/pkg (0x0 :repo "https://git.sr.ht/~zge/nullpointer-emacs")
+  :set '((0x0-default-host ttm)))
 
 ;;; Programming languages
 
@@ -434,6 +420,9 @@ indicator in the mode-line."
   (put 'dotimes-protect 'common-lisp-indent-function
        (get 'when 'common-lisp-indent-function)))
 
+;; Racket
+(acdw/pkg racket-mode)
+
 ;;; Miscellaneous
 
 (acdw/set '((disabled-command-function nil)
@@ -0,0 +1,82 @@
+:;;; acdw-modeline.el -*- lexical-binding: t; coding: utf-8-unix -*-
+;;
+;; Author: Case Duckworth <acdw@acdw.net>
+;; Created: Sometime during Covid-19, 2020
+;; Keywords: configuration
+;; URL: https://tildegit.org/acdw/emacs
+;;
+;; This file is NOT part of GNU Emacs.
+;;
+;;; License:
+;;
+;; Everyone is permitted to do whatever with this software, without
+;; limitation.  This software comes without any warranty whatsoever,
+;; but with two pieces of advice:
+;; - Don't hurt yourself.
+;; - Make good choices.
+;;
+;;; Commentary:
+;; `acdw-modeline' is a dumping ground for extra modeline functions, so they
+;; don't clutter up `init.el'.
+;;
+;;; Code:
+
+(require 'simple-modeline)
+(require 'minions)
+
+;; modified from `simple-modeline'
+(defun acdw-modeline/modified ()
+          "Displays a color-coded buffer modification/read-only
+indicator in the mode-line."
+          (if (not (string-match-p "\\*.*\\*" (buffer-name)))
+              (let* ((read-only (and buffer-read-only (buffer-file-name)))
+                     (modified (buffer-modified-p)))
+                (propertize
+                 (if read-only " =" (if modified " +" " -"))
+                 'help-echo (format
+                             (concat "Buffer is %s and %smodified\n"
+                                     "mouse-1: Toggle read-only status.")
+                             (if read-only "read-only" "writable")
+                             (if modified "" "not "))
+                 'local-map (purecopy (simple-modeline-make-mouse-map
+                                       'mouse-1
+                                       (lambda (event)
+                                         (interactive "e")
+                                         (with-selected-window
+                                             (posn-window (event-start event))
+                                           (read-only-mode 'toggle)))))
+                 'mouse-face 'mode-line-highlight))))
+
+;; all me, baby
+(defun acdw-modeline/minions ()
+          "Display a button for `minions-minor-modes-menu'."
+          (concat
+           " "
+           (propertize
+            "&"
+            'help-echo (format
+                        "Minor modes menu\nmouse-1: show menu.")
+            'local-map (purecopy (simple-modeline-make-mouse-map
+                                  'mouse-1
+                                  (lambda (event)
+                                    (interactive "e")
+                                    (with-selected-window (posn-window
+                                                           (event-start event))
+                                      (minions-minor-modes-menu)))))
+            'mouse-face 'mode-line-highlight)))
+
+;; from https://www.gonsie.com/blorg/modeline.html, from Doom
+(defun acdw-modeline/vc-branch ()
+  (let ((backend (vc-backend buffer-file-name)))
+    (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2))))
+
+;; from gonsie
+(defun acdw-modeline/buffer-name ()
+  (propertize " %b "
+              'face
+              (if (buffer-modified-p)
+                  'font-lock-warning-face
+                'font-lock-type-face)
+              'help-echo (buffer-file-name)))
+
+(provide 'acdw-modeline)
@@ -145,20 +145,37 @@ otherwise it's wrapped in `kbd'.
 The following keywords are recognized:
 
 :after ARGS .. call `autoload' on COMMAND using ARGS before
-               binding the key.  ARGS can be just the filename to
-               load; in that case it's wrapped in a list.  
+    binding the key.  ARGS can be just the filename to
+    load; in that case it's wrapped in a list.  
+
 :map KEYMAP .. define KEY in KEYMAP instead of the
-               default `acdw/bind-default-map'."
+   default `acdw/bind-default-map'.  If `:after' is also supplied,
+   run `autoload' on KEYMAP (except when using `:map-after', see).
+
+:map-after FILE .. run the underlying `define-key' command in an
+  `with-eval-after-load'.  For the rare occasion when the keymap is
+  defined in a different file than the command it binds (looking
+  at you, `org-mode')."
   (let ((after (when-let (sym (plist-get args :after))
                  (if (not (listp sym))
                      (list sym)
                    sym)))
+        (map-after (plist-get args :map-after))
         (keymap (or (plist-get args :map) acdw/bind-default-map))
         (keycode (if (vectorp key) key (kbd key)))
         (command-list))
-    (push `(define-key ,keymap ,keycode ',command) command-list)
+    (let ((define-key-command `(define-key ,keymap ,keycode ',command)))
+      (if map-after
+          (push `(with-eval-after-load ,map-after
+                   ,define-key-command)
+                command-list)
+        (push define-key-command command-list)))
     (when after
-      (push `(autoload ',command ,@after) command-list))
+      (unless (fboundp command)
+        (push `(autoload ',command ,@after) command-list))
+      (unless (or map-after
+                  (eq keymap acdw/bind-default-map))
+        (push `(autoload ',keymap ,(car after) nil nil 'keymap) command-list)))
     `(progn
        ,@command-list)))