From 7ffde2d9bb9165281be249f56d5b363447239ab7 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Mon, 31 Jan 2022 17:27:21 -0600
Subject: Changes

---
 init.el           | 13 +++++++++++--
 lisp/+modeline.el |  6 +++---
 lisp/+org.el      |  2 +-
 lisp/+scratch.el  |  3 +--
 machines/bob.el   |  7 ++++---
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/init.el b/init.el
index 99fdc6a..18ab4ea 100644
--- a/init.el
+++ b/init.el
@@ -649,7 +649,7 @@
            tab-bar-tab-name-ellipsis truncate-string-ellipsis
            tab-bar-show t
            tab-bar-close-button-show t
-           tab-bar-close-button (propertize " ◦ "
+           tab-bar-close-button (propertize " ✕ "
                                             'display t
                                             'close-tab t)
            tab-bar-new-button (propertize "+ " 'display t))
@@ -1444,7 +1444,8 @@ See also `crux-reopen-as-root-mode'."
                    :host github :repo "duckwork/machine.el"))
   (:option machine-default-font "DejaVu Sans Mono"
            machine-variable-pitch-font "DejaVu Sans")
-  (machine-settings-load))
+  (+with-ensure-after-init              ; So that they override anything here.
+   (machine-settings-load)))
 
 (setup (:straight macrostep)
   (:require macrostep)
@@ -1505,6 +1506,14 @@ See also `crux-reopen-as-root-mode'."
            modus-themes-bold-constructs t
            modus-themes-italic-constructs t
            modus-themes-headings '((t . (background))))
+  (dotimes (facen-1 8)
+    (let ((facen (1+ facen-1)))
+      (custom-set-faces
+       `(,(intern (format "org-level-%s" facen))
+         ((t :inherit
+             (,(intern (format "modus-themes-heading-%s" facen))
+              fixed-pitch))
+          :now)))))
   (dawn-schedule #'modus-themes-load-operandi
                  #'modus-themes-load-vivendi))
 
diff --git a/lisp/+modeline.el b/lisp/+modeline.el
index 300787a..9ebeb83 100644
--- a/lisp/+modeline.el
+++ b/lisp/+modeline.el
@@ -224,9 +224,9 @@ The order of elements matters: whichever one matches first is applied."
       (:propertize (line-number-mode
                     ((column-number-mode
                       (column-number-indicator-zero-based
-                       ,(concat before "%3l" sep "%2c" after)
-                       ,(concat before "%3l" sep "%2C" after))
-                      ,(concat before "%3l" sep "" after)))
+                       ,(concat before "%2l" sep "%2c" after)
+                       ,(concat before "%2l" sep "%2C" after))
+                      ,(concat before "%2l" sep "" after)))
                     ((column-number-mode
                       (column-number-indicator-zero-based
                        ,(concat before sep "%2c" after)
diff --git a/lisp/+org.el b/lisp/+org.el
index 5062a08..06e70e4 100644
--- a/lisp/+org.el
+++ b/lisp/+org.el
@@ -269,7 +269,7 @@ instead of the true count."
                                                            (region-end))))
          (org-link (when clipboard-url
                      (org-link-make-string
-                      clipboard-url
+                      (string-trim clipboard-url)
                       (or region-content
                           (read-string  "title: "
                                         (with-current-buffer
diff --git a/lisp/+scratch.el b/lisp/+scratch.el
index 2a89a95..b724a94 100644
--- a/lisp/+scratch.el
+++ b/lisp/+scratch.el
@@ -5,7 +5,7 @@
 ;;(require 'scratch)
 
 (defun +scratch-immortal ()
-  "Bury, don't kill \"*scratc*\" buffer.
+  "Bury, don't kill \"*scratch*\" buffer.
 For `kill-buffer-query-functions'."
   (if (eq (current-buffer) (get-buffer "*scratch*"))
       (progn (bury-buffer)
@@ -24,6 +24,5 @@ For `kill-buffer-query-functions'."
         (next-line 2))
       (rename-buffer (concat "*scratch<" mode ">*") t)))
 
-
 (provide '+scratch)
 ;;; +scratch.el ends here
diff --git a/machines/bob.el b/machines/bob.el
index 37831db..e36ee47 100644
--- a/machines/bob.el
+++ b/machines/bob.el
@@ -6,9 +6,10 @@
 
 (require 'acdw)
 
-(+set-faces `((default :family "CMU Typewriter Text"
-                       :height 120)
-              (variable-pitch :family "CMU Typewriter Text Variable Width"
+(+set-faces `((default :family "DejaVu Sans Mono"
+                       :height 105)
+              (fixed-pitch :inherit default)
+              (variable-pitch :family "DejaVu Sans"
                               :height 1.1)))
 
 ;;; bob.el ends here
-- 
cgit 1.4.1-21-gabe81