From 0a43a742da5a05908e90fd03916335a747c1fea7 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@kelar.org>
Date: Mon, 1 Apr 2024 15:30:59 -0400
Subject: Drop a bunch of long-unused things from .emacs.d/init.el

Also drop pulseaudio volume display from mode-line; I already have it
in my window manager's bar outside GNU Emacs.  Plus, I think this
latest change of calling out to b-pavols directly in mode-line-format
would be terribly inefficient.
---
 .emacs.d/init.el | 73 +++++++++-----------------------------------------------
 1 file changed, 11 insertions(+), 62 deletions(-)

(limited to '.emacs.d')

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index f4bb031..d38af28 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -181,10 +181,9 @@ plain variables.  This means that `setopt' will execute any
 (with-eval-after-load 'files
   (setopt
    make-backup-files nil
-   ;; Insert newline at the end of files
+   ;; Insert newline at the end of files.
    ;; require-final-newline t
-   ;; Open read-only file buffers in view-mode;
-   ;; it enables niceties like `q' for quit.
+   ;; Open read-only file buffers in view-mode, to get `q' for quit.
    view-read-only t)
   (add-to-list 'auto-mode-alist '("\\.*rc$" . conf-mode))
   (add-to-list 'auto-mode-alist '("\\.bashrc$" . sh-mode)))
@@ -219,21 +218,6 @@ plain variables.  This means that `setopt' will execute any
   (setopt battery-mode-line-format " [%b%p%% %t]")
   (display-battery-mode))
 
-(progn ; display system volume and mute states in mode-line
-  (defsubst b/pavols ()
-    "Get volume and mute state of default pulseaudio sink and source."
-    ;; <sink_volume><sink_unmuted>,<source_volume><source_unmuted>
-    ;; e.g. 46+,89-
-    (string-trim (shell-command-to-string "b-pavols")))
-  (setopt
-   mode-line-format
-   `(,@mode-line-format
-     (:eval (format " [%s]" (b/pavols))))))
-
-;; (with-eval-after-load 'fringe
-;;   ;; smaller fringe
-;;   (fringe-mode '(3 . 1)))
-
 (run-with-idle-timer 0.5 nil #'require 'winner)
 (with-eval-after-load 'winner
   (winner-mode 1))
@@ -248,19 +232,11 @@ plain variables.  This means that `setopt' will execute any
 
 (with-eval-after-load 'isearch
   (setopt
-   ;; Allow scrolling in Isearch.
    isearch-allow-scroll t
    isearch-lazy-count t
-   ;; Search for non-ASCII characters: i’d like non-ASCII characters
-   ;; such as ‘’“”«»‹›áⓐ𝒶 to be selected when I search for their ASCII
-   ;; counterpart.  Shoutout to
-   ;; http://endlessparentheses.com/new-in-emacs-25-1-easily-search-non-ascii-characters.html
+   ;; Match non-ASCII variants during search
    search-default-mode #'char-fold-to-regexp))
 
-;; (with-eval-after-load 'replace
-;;   ;; Uncomment to extend the above behaviour to query-replace.
-;;   (setopt replace-char-fold t))
-
 (b/keymap-global-set "C-x v C-=" #'vc-ediff)
 
 (with-eval-after-load 'vc-git
@@ -605,9 +581,9 @@ for all frames."
      ("\\.flac\\'" "mpv"))))
 (add-hook 'dired-mode-hook #'dired-hide-details-mode)
 
-;; (with-eval-after-load 'help
-;;   (temp-buffer-resize-mode)
-;;   (setopt help-window-select t))
+(with-eval-after-load 'help
+  (temp-buffer-resize-mode)
+  (setopt help-window-select t))
 
 (with-eval-after-load 'help-mode
   (let ((m help-mode-map))
@@ -729,12 +705,8 @@ for all frames."
         ;; other
         (list ".*atreus.freelists.org" "l.atreus")
         (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
-        ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
-        ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
+        (list ".*haskell-art.we.lurk.org" "l.haskell-art")
         (list ".*dev.lists.parabola.nu" "l.parabola-dev")
-        ;; ----------------------------------
-        ;; legend: (u)nsubscribed | (d)ead
-        ;; ----------------------------------
         ;; otherwise, leave mail in INBOX
         "INBOX")))
      (nnimap
@@ -1123,23 +1095,6 @@ non-nil."
     (add-to-list 'erc-modules 'smiley))
   (add-to-list 'erc-modules 'spelling)
 
-  ;; (set-face-attribute
-  ;;  'erc-nick-default-face nil
-  ;;  ;; :weight 'semibold
-  ;;  ;; :background "#f2f2f2"
-  ;;  ;; :foreground "#222222"
-  ;;  :weight 'bold
-  ;;  :background "#f8f8f8"
-  ;;  :foreground "#6a6a6a")
-
-  ;; (set-face-attribute
-  ;;  'erc-notice-face nil
-  ;;  ;; :background "#fffadf"
-  ;;  ;; :background "#f9f9f9"
-  ;;  :background 'unspecified
-  ;;  ;; :foreground "#809de5"
-  ;;  :foreground "steel blue")
-
   (setopt
    ;; erc-enable-logging 'erc-log-all-but-server-buffers
    erc-log-file-coding-system 'utf-8
@@ -1158,7 +1113,6 @@ non-nil."
      :foreground 'unspecified
      :weight 'unspecified
      :inherit 'erc-nick-default-face
-     ;; :background (face-attribute 'font-lock-string-face :background)
      :background "#ffffdf"))
 
   (with-eval-after-load 'erc-pcomplete
@@ -1240,10 +1194,6 @@ non-nil."
 (with-eval-after-load 'paren
   (show-paren-mode 1))
 
-;; (run-with-idle-timer 0.2 nil #'require 'elec-pair)
-;; (with-eval-after-load 'elec-pair
-;;   (electric-pair-mode))
-
 (with-eval-after-load 'simple
   (setopt
    ;; Save what I copy into clipboard from other applications into
@@ -1279,10 +1229,10 @@ non-nil."
 
 ;;; Programming modes
 
-;; (with-eval-after-load 'lisp-mode
-;;   (defun indent-spaces-mode ()
-;;     (setq indent-tabs-mode nil))
-;;   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
+(with-eval-after-load 'lisp-mode
+  (add-hook
+   'lisp-interaction-mode-hook
+   (lambda () (setq indent-tabs-mode nil))))
 
 ;; (add-to-list 'load-path (b/lisp "alloy-mode"))
 ;; (autoload 'alloy-mode "alloy-mode" nil t)
@@ -1329,7 +1279,6 @@ non-nil."
 (add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
 (add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
 (with-eval-after-load 'cmake-mode
-  ;; (setopt cmake-tab-width 4)
   (add-to-list 'load-path (b/emacs.d "lisp/cmake-font-lock"))
   (require 'cmake-font-lock))
 
-- 
cgit v1.2.3-60-g2f50