diff options
| author | Case Duckworth | 2022-01-31 17:27:21 -0600 |
|---|---|---|
| committer | Case Duckworth | 2022-01-31 17:27:39 -0600 |
| commit | 7ffde2d9bb9165281be249f56d5b363447239ab7 (patch) | |
| tree | e187a074dde1f4db39bd4b5a4ea18a809a0706ee | |
| parent | Add flyspell to vertico-multiform-categories (diff) | |
| download | emacs-7ffde2d9bb9165281be249f56d5b363447239ab7.tar.gz emacs-7ffde2d9bb9165281be249f56d5b363447239ab7.zip | |
Changes
| -rw-r--r-- | init.el | 13 | ||||
| -rw-r--r-- | lisp/+modeline.el | 6 | ||||
| -rw-r--r-- | lisp/+org.el | 2 | ||||
| -rw-r--r-- | lisp/+scratch.el | 3 | ||||
| -rw-r--r-- | 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 @@ | |||
| 649 | tab-bar-tab-name-ellipsis truncate-string-ellipsis | 649 | tab-bar-tab-name-ellipsis truncate-string-ellipsis |
| 650 | tab-bar-show t | 650 | tab-bar-show t |
| 651 | tab-bar-close-button-show t | 651 | tab-bar-close-button-show t |
| 652 | tab-bar-close-button (propertize " ◦ " | 652 | tab-bar-close-button (propertize " ✕ " |
| 653 | 'display t | 653 | 'display t |
| 654 | 'close-tab t) | 654 | 'close-tab t) |
| 655 | tab-bar-new-button (propertize "+ " 'display t)) | 655 | tab-bar-new-button (propertize "+ " 'display t)) |
| @@ -1444,7 +1444,8 @@ See also `crux-reopen-as-root-mode'." | |||
| 1444 | :host github :repo "duckwork/machine.el")) | 1444 | :host github :repo "duckwork/machine.el")) |
| 1445 | (:option machine-default-font "DejaVu Sans Mono" | 1445 | (:option machine-default-font "DejaVu Sans Mono" |
| 1446 | machine-variable-pitch-font "DejaVu Sans") | 1446 | machine-variable-pitch-font "DejaVu Sans") |
| 1447 | (machine-settings-load)) | 1447 | (+with-ensure-after-init ; So that they override anything here. |
| 1448 | (machine-settings-load))) | ||
| 1448 | 1449 | ||
| 1449 | (setup (:straight macrostep) | 1450 | (setup (:straight macrostep) |
| 1450 | (:require macrostep) | 1451 | (:require macrostep) |
| @@ -1505,6 +1506,14 @@ See also `crux-reopen-as-root-mode'." | |||
| 1505 | modus-themes-bold-constructs t | 1506 | modus-themes-bold-constructs t |
| 1506 | modus-themes-italic-constructs t | 1507 | modus-themes-italic-constructs t |
| 1507 | modus-themes-headings '((t . (background)))) | 1508 | modus-themes-headings '((t . (background)))) |
| 1509 | (dotimes (facen-1 8) | ||
| 1510 | (let ((facen (1+ facen-1))) | ||
| 1511 | (custom-set-faces | ||
| 1512 | `(,(intern (format "org-level-%s" facen)) | ||
| 1513 | ((t :inherit | ||
| 1514 | (,(intern (format "modus-themes-heading-%s" facen)) | ||
| 1515 | fixed-pitch)) | ||
| 1516 | :now))))) | ||
| 1508 | (dawn-schedule #'modus-themes-load-operandi | 1517 | (dawn-schedule #'modus-themes-load-operandi |
| 1509 | #'modus-themes-load-vivendi)) | 1518 | #'modus-themes-load-vivendi)) |
| 1510 | 1519 | ||
| 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." | |||
| 224 | (:propertize (line-number-mode | 224 | (:propertize (line-number-mode |
| 225 | ((column-number-mode | 225 | ((column-number-mode |
| 226 | (column-number-indicator-zero-based | 226 | (column-number-indicator-zero-based |
| 227 | ,(concat before "%3l" sep "%2c" after) | 227 | ,(concat before "%2l" sep "%2c" after) |
| 228 | ,(concat before "%3l" sep "%2C" after)) | 228 | ,(concat before "%2l" sep "%2C" after)) |
| 229 | ,(concat before "%3l" sep "" after))) | 229 | ,(concat before "%2l" sep "" after))) |
| 230 | ((column-number-mode | 230 | ((column-number-mode |
| 231 | (column-number-indicator-zero-based | 231 | (column-number-indicator-zero-based |
| 232 | ,(concat before sep "%2c" after) | 232 | ,(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." | |||
| 269 | (region-end)))) | 269 | (region-end)))) |
| 270 | (org-link (when clipboard-url | 270 | (org-link (when clipboard-url |
| 271 | (org-link-make-string | 271 | (org-link-make-string |
| 272 | clipboard-url | 272 | (string-trim clipboard-url) |
| 273 | (or region-content | 273 | (or region-content |
| 274 | (read-string "title: " | 274 | (read-string "title: " |
| 275 | (with-current-buffer | 275 | (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 @@ | |||
| 5 | ;;(require 'scratch) | 5 | ;;(require 'scratch) |
| 6 | 6 | ||
| 7 | (defun +scratch-immortal () | 7 | (defun +scratch-immortal () |
| 8 | "Bury, don't kill \"*scratc*\" buffer. | 8 | "Bury, don't kill \"*scratch*\" buffer. |
| 9 | For `kill-buffer-query-functions'." | 9 | For `kill-buffer-query-functions'." |
| 10 | (if (eq (current-buffer) (get-buffer "*scratch*")) | 10 | (if (eq (current-buffer) (get-buffer "*scratch*")) |
| 11 | (progn (bury-buffer) | 11 | (progn (bury-buffer) |
| @@ -24,6 +24,5 @@ For `kill-buffer-query-functions'." | |||
| 24 | (next-line 2)) | 24 | (next-line 2)) |
| 25 | (rename-buffer (concat "*scratch<" mode ">*") t))) | 25 | (rename-buffer (concat "*scratch<" mode ">*") t))) |
| 26 | 26 | ||
| 27 | |||
| 28 | (provide '+scratch) | 27 | (provide '+scratch) |
| 29 | ;;; +scratch.el ends here | 28 | ;;; +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 @@ | |||
| 6 | 6 | ||
| 7 | (require 'acdw) | 7 | (require 'acdw) |
| 8 | 8 | ||
| 9 | (+set-faces `((default :family "CMU Typewriter Text" | 9 | (+set-faces `((default :family "DejaVu Sans Mono" |
| 10 | :height 120) | 10 | :height 105) |
| 11 | (variable-pitch :family "CMU Typewriter Text Variable Width" | 11 | (fixed-pitch :inherit default) |
| 12 | (variable-pitch :family "DejaVu Sans" | ||
| 12 | :height 1.1))) | 13 | :height 1.1))) |
| 13 | 14 | ||
| 14 | ;;; bob.el ends here | 15 | ;;; bob.el ends here |