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

1 files changed, 39 insertions, 50 deletions

@@ -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)