From 736440bfe866bc47227f26b663f20cd417d26379 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Wed, 16 Sep 2020 20:22:27 -0500 Subject: Change font --- init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'init.el') diff --git a/init.el b/init.el index 0428bbb..a1983d2 100644 --- a/init.el +++ b/init.el @@ -12,7 +12,8 @@ (setq browse-url-browser-function 'browse-url-generic) (setq browse-url-generic-program "firefox") - (set-face-attribute 'default nil :family "Fira Code" :height 110)) + :custom-face + (default ((t (:family "Iosevka Term Slab" :height 110))))) (use-package no-littering :config -- cgit 1.4.1-21-gabe81 From 32964b40b3ecb186816852af0e1b6133aa4bf7d1 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Wed, 16 Sep 2020 20:22:50 -0500 Subject: Change acdw/at-* variables to constants with earmuffs --- init.el | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'init.el') diff --git a/init.el b/init.el index a1983d2..1680c74 100644 --- a/init.el +++ b/init.el @@ -34,7 +34,7 @@ (use-package better-defaults :demand :config ; add other "better defaults" of my own - (when acdw/at-larry + (when *acdw/at-larry* (setq visible-bell nil)) (setq version-control t) @@ -122,7 +122,7 @@ ;; start the server when at home -(if (not acdw/at-work) +(if *acdw/at-home* (server-start)) ;;; quality-of-life improvements @@ -195,12 +195,12 @@ (prog-mode-hook . aggressive-indent-mode)) (use-package magit - :if (not acdw/at-work) + :if *acdw/at-home* :bind ("C-x g" . magit)) (use-package forge - :if (not acdw/at-work) + :if *acdw/at-home* :after magit :custom (forge-owned-accounts '(("duckwork")))) @@ -229,7 +229,7 @@ ("C-h F" . helpful-function) ("C-h C" . helpful-command)) -(unless acdw/at-work +(when *acdw/at-home* (use-package su :config (su-mode)) @@ -273,7 +273,7 @@ :init (setq doom-modeline-icon nil) (setq doom-modeline-enable-word-count t) - (when acdw/at-larry + (when *acdw/at-larry* (setq display-time-format "%R") (display-time-mode)) :hook @@ -316,12 +316,12 @@ (enable-theme 'modus-operandi) (start-process-shell-command "light" nil "light -S 60")) - (if acdw/at-work + (if *acdw/at-work* (enable-theme 'modus-operandi) (run-at-time (nth 1 (split-string (sunrise-sunset))) (* 60 60 24) #'acdw/sunrise))) -(unless acdw/at-work +(when *acdw/at-home* (use-package modus-vivendi-theme :if window-system :config @@ -388,7 +388,7 @@ (elpher-go (match-string 1))))) ;;; exwm ~ Emacs X Window Manager -(when acdw/at-larry +(when *acdw/at-larry* (use-package exwm :if window-system :demand @@ -482,10 +482,11 @@ (use-package exwm-edit) - ) ;; end of acdw/at-larry block for exwm + ) ;; end of *acdw/at-larry* block for exwm ;;; other applications (use-package circe + :if *acdw/at-larry* :init (defun my/fetch-password (&rest params) "Fetch a password from auth-sources" -- cgit 1.4.1-21-gabe81 From a80f901a345aaa8e0ca3c883ec05264e70b6d12e Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Wed, 16 Sep 2020 20:23:08 -0500 Subject: Allow recursive minibuffers --- early-init.el | 9 +++++---- init.el | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'init.el') diff --git a/early-init.el b/early-init.el index 5e28f4d..e7595a9 100644 --- a/early-init.el +++ b/early-init.el @@ -17,12 +17,13 @@ ;;(setq debug-on-error t) ;;; different platforms -(setq acdw/at-work (eq system-type 'windows-nt)) -(setq acdw/at-larry (string= (system-name) "larry")) -(setq acdw/at-bax (string= (system-name) "bax")) +(defconst *acdw/at-work* (eq system-type 'windows-nt)) +(defconst *acdw/at-larry* (string= (system-name) "larry")) +(defconst *acdw/at-bax* (string= (system-name) "bax")) +(defconst *acdw/at-home* (or *acdw/at-larry* *acdw/at-bax*)) ;; this needs to be before bootstrapping straight.el -(when acdw/at-work +(when *acdw/at-work* (add-to-list 'exec-path "~/bin") (add-to-list 'exec-path "C:/Users/aduckworth/Downloads/PortableGit/bin")) diff --git a/init.el b/init.el index 1680c74..ede4118 100644 --- a/init.el +++ b/init.el @@ -174,6 +174,8 @@ (use-package selectrum :config (ido-mode -1) ;; not sure why this is necessary + (setq enable-recursive-minibuffers t) + (minibuffer-depth-indicate-mode) (selectrum-mode 1)) (use-package prescient) -- cgit 1.4.1-21-gabe81 From 849e805ad2b1f5043ec585363bd1890cb04cb378 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Wed, 16 Sep 2020 21:35:33 -0500 Subject: Set fonts ... better? --- init.el | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'init.el') diff --git a/init.el b/init.el index ede4118..fbbb0d7 100644 --- a/init.el +++ b/init.el @@ -12,8 +12,29 @@ (setq browse-url-browser-function 'browse-url-generic) (setq browse-url-generic-program "firefox") - :custom-face - (default ((t (:family "Iosevka Term Slab" :height 110))))) + ;; fonts + (require 'cl) + (defun font-candidate (&rest fonts) + "Return existing font which matches first." + (find-if (lambda (f) (find-font (font-spec :name f))) fonts)) + + (set-face-attribute 'variable-pitch nil + :font (font-candidate + "Dejavu Sans-11" + "Georgia-11" + "Times-11")) + + (set-face-attribute 'fixed-pitch nil + :font (font-candidate + "Fira Code-11" + "DejaVu Sans Mono-11" + "Courier-11" + "Fixed-11")) + + (set-face-attribute 'default nil + :font (font-candidate + "Iosevka Term Slab-11" + "Consolas-11"))) (use-package no-littering :config @@ -107,6 +128,7 @@ ([remap split-window-right] . split-and-follow-right) :hook + (prog-mode-hook . prettify-symbols-mode) (auto-save-hook . full-auto-save) (focus-out-hook . full-auto-save) (before-save-hook . delete-trailing-whitespace)) -- cgit 1.4.1-21-gabe81 From d09180d037ba552532593cb44d8daf36a1f99479 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Wed, 16 Sep 2020 21:43:58 -0500 Subject: Change fonts to dynamic-fonts Is this a good idea? We'll see. Maybe I'll fork the damn thing. --- init.el | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) (limited to 'init.el') diff --git a/init.el b/init.el index fbbb0d7..afedefd 100644 --- a/init.el +++ b/init.el @@ -10,31 +10,7 @@ (setq calendar-longitude -91.83) (setq browse-url-browser-function 'browse-url-generic) - (setq browse-url-generic-program "firefox") - - ;; fonts - (require 'cl) - (defun font-candidate (&rest fonts) - "Return existing font which matches first." - (find-if (lambda (f) (find-font (font-spec :name f))) fonts)) - - (set-face-attribute 'variable-pitch nil - :font (font-candidate - "Dejavu Sans-11" - "Georgia-11" - "Times-11")) - - (set-face-attribute 'fixed-pitch nil - :font (font-candidate - "Fira Code-11" - "DejaVu Sans Mono-11" - "Courier-11" - "Fixed-11")) - - (set-face-attribute 'default nil - :font (font-candidate - "Iosevka Term Slab-11" - "Consolas-11"))) + (setq browse-url-generic-program "firefox")) (use-package no-littering :config @@ -293,6 +269,25 @@ ;;; theming and looks +(use-package dynamic-fonts + :init + (setq dynamic-fonts-preferred-monospace-fonts + '("Iosevka Term Slab" + "Consolas" + "Fira Code" + "DejaVu Sans Mono" + "Courier" + "Fixed")) + (setq dynamic-fonts-preferred-monospace-point-size 11) + (setq dynamic-fonts-preferred-proportional-fonts + '("DejaVu Sans" + "Georgia" + "Times New Roman" + "Times")) + (setq dynamic-fonts-preferred-proportional-point-size 12) + :config + (dynamic-fonts-setup)) + (use-package doom-modeline :init (setq doom-modeline-icon nil) -- cgit 1.4.1-21-gabe81