1 files changed, 118 insertions, 119 deletions

@@ -13,9 +13,10 @@
   (setopt tab-bar-show 1
           recenter-positions '(top middle bottom)
           initial-scratch-message
-          (mapconcat (lambda (s) (format ";; %s" s))
-                     (process-lines "fortune")
-                     "\n"))
+          (format "%s\n\n"
+                  (mapconcat (lambda (s) (format ";; %s" s))
+                             (process-lines "fortune" "-s")
+                             "\n")))
   (keymap-global-unset "C-\\")
   (add-hook 'kill-buffer-query-functions
             (defun scratch@immortal ()
@@ -27,6 +28,8 @@
   :config
   (add-hook 'server-after-make-frame-hook
             (defun first-frame@set-fonts ()
+              (remove-hook 'server-after-make-frame-hook
+                           #'first-frame@set-fonts)
               (face-spec-set 'fixed-pitch
                              `((t :family ,(find-font "Comic Code"
                                                       "DejaVu Sans Mono")
@@ -73,7 +76,9 @@
                                                  (telugu . "Noto Sans Telugu")
                                                  (tibetan . "Noto Sans Tibetan"))
                        if (member font ffl)
-                       do (set-fontset-font t charset font)))))
+                       do (set-fontset-font t charset font))))
+  (unless (daemonp)
+    (run-with-idle-timer 1 nil #'first-frame@set-fonts)))
 
 (use-package text-mode
   :config
@@ -81,6 +86,8 @@
 
 (use-package prog-mode
   :config
+  (setopt tab-width 8
+          sh-indentation tab-width)
   (add-hook 'prog-mode-hook #'auto-fill-mode)
   (add-hook 'prog-mode-hook
             (defun prog@indent-tabs-maybe ()
@@ -90,63 +97,6 @@
                                    'haskell-mode)
                    -1 1)))))
 
-(use-package eshell
-  :preface
-  ;; TODO: Break this out into its own package (eshell-pop?).  This may not work
-  ;; the way I want it to sometimes .. but then, I don't know how I want it to
-  ;; work sometimes either.  More testing, clearly, is needed.
-  (defvar eshell-buffer-format "*eshell:%s*"
-    "Format for eshell buffer names.")
-  (defun eshell-rename-pwd ()
-    (rename-buffer (format eshell-buffer-format default-directory) t))
-  (defun eshell-last-dir ()
-    (goto-char (point-max))
-    (insert "cd -")
-    (eshell-send-input))
-  (defun eshellp (buffer-or-name)
-    (with-current-buffer buffer-or-name
-      (derived-mode-p 'eshell-mode)))
-  (defun +eshell (&optional new)
-    (interactive "P")
-    (let ((dir default-directory)
-          (bname (format eshell-buffer-format default-directory))
-          (display-comint-buffer-action 'pop-to-buffer))
-      (if-let ((buf (and (not new)
-                         (or (get-buffer bname)
-                             (seq-find #'eshellp
-                                       (reverse (buffer-list)))))))
-          (pop-to-buffer buf)
-        (eshell new))
-      (eshell-rename-pwd)
-      (unless (equal default-directory dir)
-        (goto-char (point-max))
-        (insert (format "cd %s" dir))
-        (eshell-send-input))))
-  (defun +eshell-quit (&optional choose)
-    (interactive "P")
-    (if choose
-        (let* ((bufs (mapcar #'buffer-name
-                             (seq-filter #'eshellp
-                                         (buffer-list))))
-               (buf (get-buffer
-                     (completing-read "Eshell: "
-                                      bufs nil t nil nil (car bufs)))))
-          (quit-window)
-          (pop-to-buffer buf))
-      (quit-window)))
-  :init
-  (add-hook 'eshell-post-command-hook #'eshell-rename-pwd)
-  :commands eshell
-  :bind (("C-z" . +eshell)
-         :map eshell-mode-map
-         ("C-z" . +eshell-quit)
-         ("C-o" . eshell-last-dir))
-  :config
-  (add-hook 'eshell-mode-hook
-            (defun eshell-setup ()
-              (setq-local imenu-generic-expression
-                          '(("Prompt" " $ \\(.*\\)" 1))))))
-
 (use-package auth-source
   :config
   (setopt auth-sources '(default "secrets:passwords"))
@@ -159,24 +109,6 @@
 (use-package flyspell
   :hook org-mode-hook)
 
-(use-package browse-url
-  :preface
-  (defcustom +browse-url-other-safe-browser-functions nil
-    "Other safe browser functions."
-    :type '(repeat function))
-  (defun +browse-url-browser-function-safe-p (f)
-    "Return t if F is a safe browser function."
-    (memq f (append +browse-url-other-safe-browser-functions
-                    (mapcar (lambda (i)
-                              (plist-get (cdr i) :value))
-                            (seq-filter (lambda (i)
-                                          (eq (car i) 'function-item))
-                                        (cdr (get 'browse-url-browser-function
-                                                  'custom-type)))))))
-  :config
-  (put 'browse-url-browser-function 'safe-local-variable
-       '+browse-url-browser-function-safe-p))
-
 (use-package dired
   :bind (("C-x C-j" . dired-jump)
          ([remap list-directory] . dired)
@@ -206,6 +138,63 @@
   (add-hook 'dired-mode-hook #'hl-line-mode)
   (add-hook 'dired-mode-hook #'truncate-lines-local-mode))
 
+(use-package dictionary
+  :custom
+  (dictionary-server (if (or (executable-find "dictd")
+                             (file-exists-p "/usr/sbin/dictd")) ; debian
+                         "localhost"
+                       "dict.org"))
+  :bind
+  (("C-c d" . dictionary-search)))
+
+(use-package mouse
+  :config
+  (setopt context-menu-functions '(context-menu-undo
+                                   context-menu-region
+                                   context-menu-middle-separator
+                                   context-menu-local
+                                   context-menu-minor))
+  (context-menu-mode))
+
+(use-package password-cache
+  :config
+  (setopt password-cache t
+          password-cache-expiry 3600))
+
+(use-package time
+  :config
+  (setopt display-time-format " %H:%M"
+          display-time-mail-function
+          (defun +notmuch-new-mail-p ()
+          (plist-get (cl-find "inbox+unread"
+                              (ignore-errors
+                                (notmuch-hello-query-counts notmuch-saved-searches))
+                              :key (lambda (l) (plist-get l :name))
+                              :test #'equal)
+                     :count))
+          display-time-default-load-average nil)
+  (display-time-mode))
+
+
+;;; Applications
+
+(use-package acdw-mail
+  :load-path "lisp/"
+  :demand t
+  :bind (("C-c n" . +notmuch-goto)))
+
+(use-package acdw-org
+  :load-path "lisp/")
+
+(use-package acdw-shell
+  :load-path "lisp/")
+
+(use-package acdw-web
+  :load-path "lisp/")
+
+(use-package _work
+  :load-path "~/Sync/emacs/private/")
+
 
 ;;; Locally-developed packages
 
@@ -284,7 +273,7 @@ With prefix ARG, toggle the value of
   (global-frowny-mode))
 
 (use-package jabber
-  :load-path "~/src/emacs/emacs-jabber/"
+  :load-path "~/src/emacs/jabber/"
   :preface
   (defvar jabber-prefix-width 10
     "Width of jabber prompts and other prefixes.")
@@ -300,7 +289,7 @@ With prefix ARG, toggle the value of
   (jabber-activity-face ((t :inherit jabber-chat-prompt-foreign
                             :foreground unspecified
                             :weight normal)))
-  (jabber-activity-personal-face ((t :inherit font-lock-warning-face
+  (jabber-activity-personal-face ((t :inherit jabber-chat-prompt-local
                                      :foreground unspecified
                                      :weight bold)))
   (jabber-chat-prompt-local ((t :inherit font-lock-warning-face
@@ -323,21 +312,15 @@ With prefix ARG, toggle the value of
             ("Mode #.*" . jabber-muc-presence-dim)
             ("." . jabber-muc-presence-dim))
           jabber-activity-make-strings #'jabber-activity-make-strings-shorten
-          jabber-last-read-marker (make-string fill-column ?-)
           jabber-rare-time-format  " - - - - - - %H:%M %F"
           ;; buffer name formats
-          jabber-chat-buffer-format "%n <xmpp>"
-          jabber-browse-buffer-format "%n <xmpp-browse>"
-          jabber-groupchat-buffer-format "%n <xmpp-muc>"
-          jabber-muc-private-buffer-format "%n <xmpp-muc-private>"
+          ;; jabber-chat-buffer-format "%n <xmpp>"
+          ;; jabber-browse-buffer-format "%n <xmpp-browse>"
+          ;; jabber-groupchat-buffer-format "%n <xmpp-muc>"
+          ;; jabber-muc-private-buffer-format "%n <xmpp-muc-private>"
           ;; "prompt" (speaker) formats
           jabber-groupchat-prompt-format (format "%%>%dn | " jabber-prefix-width)
           jabber-chat-local-prompt-format (format "%%>%dn | " jabber-prefix-width)
-          jabber-chat-system-prompt-format (let ((s ""))
-                                             (while (< (length s)
-                                                       jabber-prefix-width)
-                                               (setq s (concat s " *")))
-                                             s)
           jabber-chat-foreign-prompt-format (format "%%>%dn | " jabber-prefix-width)
           jabber-muc-private-foreign-prompt-format "\n%g/%n | ")
   (add-hook 'jabber-chat-mode-hook #'jabber-ui-setup)
@@ -355,7 +338,8 @@ With prefix ARG, toggle the value of
                                     word-boundary)))
                     (hi-lock-unface-buffer regexp)
                     (highlight-regexp regexp 'font-lock-warning-face))))))
-  (add-hook 'window-configuration-change-hook #'jabber-chat-update-focus))
+  (when (fboundp 'jabber-chat-update-focus)
+    (add-hook 'window-configuration-change-hook #'jabber-chat-update-focus)))
 
 (use-package keepassxc-shim
   :load-path "~/src/emacs/keepassxc-shim/"
@@ -365,10 +349,18 @@ With prefix ARG, toggle the value of
 
 ;;; External packages
 
+(use-package trashed
+  :ensure t)
+
 (use-package form-feed
   :ensure t
-  :hook (emacs-lisp-mode-hook
-         jabber-chat-mode-hook))
+  :hook (emacs-lisp-mode-hook))
+
+(use-package clean-kill-ring
+  :vc (:url "https://github.com/NicholasBHubbard/clean-kill-ring.el")
+  :config
+  (setopt clean-kill-ring-prevent-duplicates t)
+  (clean-kill-ring-mode))
 
 (use-package minions
   :ensure t
@@ -407,15 +399,6 @@ With prefix ARG, toggle the value of
   (advice-add 'emacs-completion-at-point
               :around #'cape-wrap-nonexclusive))
 
-(use-package ws-butler
-  :ensure t
-  :config
-  (setopt ws-butler-trim-predicate
-          (lambda (begin end)
-            (not (eq 'font-lock-string-face
-                     (get-text-property end 'face)))))
-  (ws-butler-global-mode))
-
 (use-package wgrep
   :ensure t
   :config
@@ -563,10 +546,6 @@ With prefix ARG, toggle the value of
   (setopt  sly-net-coding-system 'utf-8-unix)
   (sly-symbol-completion-mode -1))
 
-(use-package eat
-  :ensure t
-  :hook (eshell-load-hook . eat-eshell-mode))
-
 (use-package pdf-tools
   :ensure t
   :mode ("\\.[pP][dD][fF]\\'" . pdf-view-mode)
@@ -722,16 +701,36 @@ With PREFIX, prompt to change the current dictionary."
          (emacs-lisp-mode-hook . embrace-emacs-lisp-mode-hook)
          (latex-mode-hook . embrace-LaTeX-mode-hook)))
 
-
-;;; Applications
-
-(use-package acdw-mail
-  :load-path "lisp/"
-  :demand t
-  :bind (("C-c n" . +notmuch-goto)))
-
-(use-package acdw-org
-  :load-path "lisp/")
+(use-package apheleia
+  :ensure t
+  :config
+  (setopt apheleia-hide-log-buffers t)
+  (setf (alist-get 'shfmt apheleia-formatters)
+        '("shfmt" "--case-indent"))
+  (global-set-key (kbd "M-C-\\")
+                  (defun +apheleia-format|indent-buffer ()
+                    (interactive)
+                    (if-let ((formatters (apheleia--get-formatters)))
+                        (apheleia-format-buffer
+                         formatters
+                         (lambda ()
+                           (with-demoted-errors "Apheleia: %s"
+                             (when buffer-file-name
+                               (let ((apheleia--format-after-save-in-progress t))
+                                 (apheleia--save-buffer-silently)))
+                             (run-hooks 'apheleia-post-format-hook))))
+                      (indent-region (point-min) (point-max))
+                      (when buffer-file-name
+                        (save-buffer))))))
+
+(use-package php-mode
+  :ensure t)
 
-(use-package _work
-  :load-path "~/Sync/emacs/private/")
+(use-package tab-bar
+  :config
+  (setopt tab-bar-show t
+          tab-bar-format
+          (append tab-bar-format
+                  '(tab-bar-format-align-right
+                    tab-bar-format-global)))
+  (tab-bar-mode))