From 97a02eb0a4e8998074ad5c01adc4d98c6fe3c52a Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Mon, 3 Jan 2022 22:31:45 -0600 Subject: Change fonts... again --- early-init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'early-init.el') diff --git a/early-init.el b/early-init.el index 77a9ecf..2c9d2e6 100644 --- a/early-init.el +++ b/early-init.el @@ -68,9 +68,9 @@ See `no-littering' for examples.") ;; Fonts -(let ((font-name "Go Mono") +(let ((font-name "DejaVu Sans Mono") (font-size 105) - (variable-font-name "Go") + (variable-font-name "DejaVu Sans") (variable-font-size 1.0)) (set-face-attribute 'default nil :family font-name :height font-size :weight 'book) -- cgit 1.4.1-21-gabe81 From 9c6bd60e2db90d38f8528fa8b6dbc96be751382f Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Mon, 3 Jan 2022 22:31:56 -0600 Subject: Re-indent --- early-init.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'early-init.el') diff --git a/early-init.el b/early-init.el index 2c9d2e6..da5d73c 100644 --- a/early-init.el +++ b/early-init.el @@ -55,16 +55,16 @@ See `no-littering' for examples.") ;;; Default frame settings (setq default-frame-alist '((tool-bar-lines . 0) - (menu-bar-lines . 0) - (vertical-scroll-bars) - (horizontal-scroll-bars)) + (menu-bar-lines . 0) + (vertical-scroll-bars) + (horizontal-scroll-bars)) frame-inhibit-implied-resize t frame-resize-pixelwise t window-resize-pixelwise t inhibit-x-resources t indicate-empty-lines nil indicate-buffer-boundaries '((top . right) - (bottom . right))) + (bottom . right))) ;; Fonts @@ -84,9 +84,9 @@ See `no-littering' for examples.") (setq package-enable-at-startup nil package-quickstart nil straight-host-usernames '((github . "duckwork") - (gitlab . "acdw")) + (gitlab . "acdw")) straight-check-for-modifications '(check-on-save - find-when-checking)) + find-when-checking)) (setq no-littering-etc-directory .etc no-littering-var-directory .etc @@ -117,8 +117,8 @@ See `no-littering' for examples.") (require 'straight-x) (dolist (pkg '(el-patch - no-littering - setup)) + no-littering + setup)) (straight-use-package pkg) (require pkg) (require (intern (format "+%s" pkg)) nil :noerror)) -- cgit 1.4.1-21-gabe81 From 43f693d750e0b5d8b1f3ba2a5c37469b004c2027 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Tue, 4 Jan 2022 00:39:03 -0600 Subject: Remove el-patch on setup Setup 1.2 (I'm pretty sure) removed the `ensure-function' and `ensure-kbd' functions, instead using an `:ensure' keyword in `setup-define'. This makes it way harder to /not/ ensure things when I don't want them, so I just have to use regular elisp when I want to do something funky. Oh well. --- early-init.el | 8 ++++---- lisp/+setup.el | 25 ------------------------- 2 files changed, 4 insertions(+), 29 deletions(-) (limited to 'early-init.el') diff --git a/early-init.el b/early-init.el index da5d73c..02f92c2 100644 --- a/early-init.el +++ b/early-init.el @@ -123,11 +123,11 @@ See `no-littering' for examples.") (require pkg) (require (intern (format "+%s" pkg)) nil :noerror)) -;;; Appendix +;; Setup `setup' + +(add-to-list 'setup-modifier-list 'setup-wrap-to-demote-errors) -;; I've patched setup to look at `setup-ensure-function-inhibit' to decide -;; whether to ensure functions or not with local macros. -(setq setup-ensure-function-inhibit t) +;;; Appendix ;; Get rid of a dumb alias. straight-ಠ_ಠ-mode really slows down all ;; minibuffer completion functions. Since it's a (rarely-used, even) diff --git a/lisp/+setup.el b/lisp/+setup.el index ac99c1f..c6bcb9e 100644 --- a/lisp/+setup.el +++ b/lisp/+setup.el @@ -24,31 +24,6 @@ (require 'setup) (require 'straight) -;; I don't like the "magic" `setup' performs to ensure a symbol is a -;; function in `:global', `:bind', `:hook', `:hook-into', and others. -;; So here, I'll just make it return the symbol unmodified. -(el-patch-feature setup) -(with-eval-after-load 'setup - (el-patch-defvar - (el-patch-add setup-ensure-function-inhibit nil - "Whether to inhibit `setup-ensure-function'.")) - (el-patch-defun setup-ensure-function (sexp) - (el-patch-concat - "Attempt to return SEXP as a quoted function name." - (el-patch-add - "\nIf `setup-ensure-function-inhibit' is non-nil, just return SEXP.")) - (el-patch-wrap 3 0 - (if (and setup-ensure-function-inhibit - (not (eq sexp (setup-get 'mode)))) - sexp - (cond ((eq (car-safe sexp) 'function) - sexp) - ((eq (car-safe sexp) 'quote) - `#',(cadr sexp)) - ((symbolp sexp) - `#',sexp) - (sexp)))))) - (setup-define :face (lambda (face spec) `(custom-set-faces '(,face ,spec 'now "Customized by `setup'."))) -- cgit 1.4.1-21-gabe81