1 files changed, 62 insertions, 12 deletions

@@ -10,12 +10,20 @@
 
 (use-package emacs                      ; Misc. config
   :custom-face
-  (default ((t :family "Comic Code"
+  (fixed-pitch ((t :family ,(find-font "Comic Code"
+                                       "DejaVu Sans Mono")
+                   :height 100)))
+  (variable-pitch ((t :family ,(find-font "Atkinson Hyperlegible"
+                                          "DejaVu Serif")
+                      :height 1.4)))
+  (default ((t :family ,(find-font "Comic Code"
+                                   "DejaVu Sans Mono")
                :height 100)))
-  (variable-pitch ((t :family "Comic Code")))
+  (font-lock-comment-face ((t :slant italic)))
   :config
   (setopt tab-bar-show 1
-          recenter-positions '(top middle bottom)))
+          recenter-positions '(top middle bottom))
+  (keymap-global-unset "C-\\"))
 
 (use-package faces
   :defer 2                              ; This is sort of expensive
@@ -272,7 +280,9 @@ With prefix ARG, toggle the value of
     (visual-fill-column-mode)
     (electric-pair-local-mode -1)
     (auto-fill-mode -1)
-    (setq-local wrap-prefix (make-string (+ 3 jabber-prefix-width) #x20)))
+    (setq-local wrap-prefix (make-string (+ 3 jabber-prefix-width) #x20)
+                visual-fill-column-extra-text-width `(,(+ 3 jabber-prefix-width)
+                                                      . 1)))
   :custom-face
   (jabber-activity-face ((t :inherit jabber-chat-prompt-foreign
                             :foreground unspecified
@@ -294,12 +304,13 @@ With prefix ARG, toggle the value of
   :config
   (setopt jabber-account-list '(("acdw@hmm.st"))
           jabber-auto-reconnect t
-          jabber-last-read-marker (make-string 40 ?-)
+          jabber-last-read-marker (make-string (- fill-column 8) ?—)
           jabber-muc-decorate-presence-patterns
-          '(("\\( enters the room ([^)]+)\\| has left the chatroom\\)$")
+          '(("\\( enters the room ([^)]+)\\| has left the chatroom\\)$" . nil)
+            ("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 8) ?-)
+          jabber-last-read-marker (make-string fill-column ?-)
           jabber-rare-time-format  " - - - - - - %H:%M %F"
           ;; buffer name formats
           jabber-chat-buffer-format "%n <xmpp>"
@@ -341,6 +352,11 @@ With prefix ARG, toggle the value of
 
 ;;; External packages
 
+(use-package form-feed
+  :ensure t
+  :hook (emacs-lisp-mode-hook
+         jabber-chat-mode-hook))
+
 (use-package minions
   :ensure t
   :config (minions-mode))
@@ -349,7 +365,7 @@ With prefix ARG, toggle the value of
   :ensure t
   :init
   (setopt visual-fill-column-center-text t
-          visual-fill-column-extra-text-width '(1 . 1))
+          visual-fill-column-extra-text-width '(3 . 3))
   :config
   (add-hook 'visual-fill-column-mode-hook #'visual-line-mode)
   (add-hook 'eww-mode-hook #'visual-fill-column-mode)
@@ -620,7 +636,7 @@ With prefix ARG, toggle the value of
                       (push (cons (format "%s - %s" name tags) url) chans)))))))))
 
 (use-package wiki-abbrev
-  :defer 5                              ; Allow for network to come up
+  :after org                            ; Don't need abbrevs til I load org.
   :load-path "~/src/emacs/wiki-abbrev.el/"
   :config
   (setopt wiki-abbrev-file (etc/ "wiki-abbrevs"))
@@ -651,8 +667,8 @@ With PREFIX, prompt to change the current dictionary."
   :ensure t
   :after dired
   :bind (:map dired-mode-map
-             (("TAB" . dired-subtree-cycle)
-              ("i" . dired-subtree-toggle))))
+              (("TAB" . dired-subtree-cycle)
+               ("i" . dired-subtree-toggle))))
 
 (use-package dired-hide-dotfiles
   ;; I could maybe use a more general package for this ... see
@@ -661,11 +677,45 @@ With PREFIX, prompt to change the current dictionary."
   :bind (:map dired-mode-map
               ("." . dired-hide-dotfiles-mode)))
 
+(use-package embrace
+  :ensure t
+  :preface
+  (defmacro org-insert-or-embrace (char)
+    "Define a function to insert CHAR, or `embrace' the region with it."
+    (let* ((fn-name (intern (format "org-insert-or-embrace-%s" char)))
+           (char (cond ((characterp char) char)
+                       ((stringp char) (string-to-char char))
+                       (t (user-error "Bad format for char: %S" char)))))
+      `(defun ,fn-name (n)
+         ,(format "Insert N %ss, or surround the region with them."
+                  (char-to-string char))
+         (interactive "p")
+         (if (region-active-p)
+             (dotimes (_ n)
+               (embrace--add-internal (region-beginning) (region-end) ,char)
+               (forward-char 1))
+           (self-insert-command n ,char)))))
+  (with-eval-after-load 'org
+    (require 'embrace)
+    (keymap-set org-mode-map "*" (org-insert-or-embrace "*"))
+    (keymap-set org-mode-map "/" (org-insert-or-embrace "/"))
+    (keymap-set org-mode-map "_" (org-insert-or-embrace "_"))
+    (keymap-set org-mode-map "=" (org-insert-or-embrace "="))
+    (keymap-set org-mode-map "~" (org-insert-or-embrace "~"))
+    (keymap-set org-mode-map "+" (org-insert-or-embrace "+")))
+  :bind (("C-\"" . embrace-commander))
+  :hook ((org-mode-hook . embrace-org-mode-hook)
+         (ruby-mode-hook . embrace-ruby-mode-hook)
+         (emacs-lisp-mode-hook . embrace-emacs-lisp-mode-hook)
+         (latex-mode-hook . embrace-LaTeX-mode-hook)))
+
 
 ;;; Applications
 
 (use-package acdw-mail
-  :load-path "lisp/")
+  :load-path "lisp/"
+  :demand t
+  :bind (("C-c n" . +notmuch-goto)))
 
 (use-package acdw-org
   :load-path "lisp/")