From 09130882c916ebaf57cb7a320dba4db508b1a4fd Mon Sep 17 00:00:00 2001 From: Marrub Date: Thu, 4 Jun 2020 13:30:26 -0600 Subject: [PATCH 1/3] add emacs stuff to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 9bc8f14..6339f50 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ computers/*/fish/priv +emacs/backup +emacs/custom.el +emacs/elpa From 4e636b399d1fe67eb75bb82c959eee6bbfa77fc5 Mon Sep 17 00:00:00 2001 From: Marrub Date: Thu, 4 Jun 2020 14:22:05 -0600 Subject: [PATCH 2/3] emacs: STOP BEEPING --- .gitignore | 1 + emacs/early-init.el | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6339f50..c008f33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ computers/*/fish/priv +emacs/auto-save-list emacs/backup emacs/custom.el emacs/elpa diff --git a/emacs/early-init.el b/emacs/early-init.el index 4562faf..60a0d9a 100644 --- a/emacs/early-init.el +++ b/emacs/early-init.el @@ -14,7 +14,8 @@ ;; important ergonomics (setq fill-column 80 - sentence-end-double-space nil) + sentence-end-double-space nil + ring-bell-function #'ignore) (defalias #'yes-or-no-p #'y-or-n-p) From bf47f664ccc64295b694cda51183c79d907909b2 Mon Sep 17 00:00:00 2001 From: "Alison G. Watson" Date: Fri, 5 Jun 2020 14:38:20 -0600 Subject: [PATCH 3/3] emacs: add mode-line family for non-freetype systems --- emacs/early-init.el | 14 ++++++++------ emacs/init.el | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/emacs/early-init.el b/emacs/early-init.el index 60a0d9a..5c572e5 100644 --- a/emacs/early-init.el +++ b/emacs/early-init.el @@ -36,12 +36,14 @@ (copy-face 'default 'fixed-pitch) (copy-face 'default 'mode-line) -;; fontset usage -(dolist (range '((#x2310 . #x26bf) - (#x26c0 . #x329f) - (#x1f000 . #x1fa9f))) - (set-fontset-font t range "Noto Color Emoji")) +(setq agw-mode-line-family + (if (string-equal system-type "windows-nt") + "Noto Mono" + "tewi2a")) -(set-fontset-font t '(#x2e80 . #x9fff) "Noto Sans CJK JP") +;; font alternatives +(setq face-font-family-alternatives + '(("Courier Prime Code" "Noto Mono") + ("Source Sans Pro" "Noto Sans" "Noto Sans CJK JP" "Noto Color Emoji"))) ;; EOF diff --git a/emacs/init.el b/emacs/init.el index dc85c1c..93aaf2d 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -86,7 +86,7 @@ header-line header-line-highlight)) (set-face-attribute face nil - :family "tewi2a" + :family agw-mode-line-family :height 90 :weight 'normal :width 'normal))