diff --git a/applications/xresources b/applications/xresources index 357d549..4eedc67 100644 --- a/applications/xresources +++ b/applications/xresources @@ -2,6 +2,3 @@ *Menu.background: Black *Menu.foreground: White Oneko.reverse: true -Emacs.font: -*-Courier Prime Code-*-r-normal-*-*-120-*-*-m-*-iso10646-1 -Emacs.width: 80 -Emacs.height: 30 diff --git a/emacs/early-init.el b/emacs/early-init.el index 0398649..4562faf 100644 --- a/emacs/early-init.el +++ b/emacs/early-init.el @@ -1,4 +1,46 @@ +;; meta stuff +(let ((usr-backup (locate-user-emacs-file "backup")) + (usr-custom (locate-user-emacs-file "custom.el"))) + (setq auto-save-default nil + backup-directory-alist `((".*" . ,usr-backup)) + create-lockfiles nil + custom-file usr-custom + gc-cons-threshold 64000000 + global-mark-ring-max 1024 + inhibit-compacting-font-caches t + inhibit-startup-screen t + initial-scratch-message nil + mark-ring-max 1024)) + +;; important ergonomics +(setq fill-column 80 + sentence-end-double-space nil) + +(defalias #'yes-or-no-p #'y-or-n-p) + +;; packages (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("gnu" . "https://elpa.gnu.org/packages/"))) +;; default visuals +(add-to-list 'default-frame-alist '(width . 80)) +(add-to-list 'default-frame-alist '(height . 30)) + +(set-face-attribute 'default nil :family "Courier Prime Code" + :height 120 :weight 'normal :width 'normal) + +(set-face-attribute 'variable-pitch nil :family "Source Sans Pro" + :height 120 :weight 'normal :width 'normal) + +(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")) + +(set-fontset-font t '(#x2e80 . #x9fff) "Noto Sans CJK JP") + ;; EOF diff --git a/emacs/init.el b/emacs/init.el index 4185d86..fec7ffe 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -1,43 +1,16 @@ ;; startup -(let ((usr-backup (locate-user-emacs-file "backup")) - (usr-custom (locate-user-emacs-file "custom.el")) - (usr-data (locate-user-emacs-file "data.el"))) - (setq auto-save-default nil - backup-directory-alist `((".*" . ,usr-backup)) - create-lockfiles nil - custom-file usr-custom - gc-cons-threshold 64000000 - global-mark-ring-max 1024 - inhibit-compacting-font-caches t - inhibit-startup-screen t - initial-scratch-message nil - mark-ring-max 1024) - +(let ((usr-data (locate-user-emacs-file "data.el"))) (load custom-file) (load usr-data)) -(defalias #'yes-or-no-p #'y-or-n-p) - -(setq fill-column 80 - sentence-end-double-space nil) - -(set-face-attribute 'variable-pitch nil :height 140 :family "Source Sans Pro") -(set-face-attribute 'fixed-pitch nil :height 140 :family "Source Code Pro") - -(dolist (range '((#x2310 . #x26bf) - (#x26c0 . #x329f) - (#x1f000 . #x1fa9f))) - (set-fontset-font t range "Noto Color Emoji")) - -(set-fontset-font t '(#x2e80 . #x9fff) "Noto Sans CJK JP") - ;; mode line (setq-default mode-line-format '("%+" mode-line-buffer-identification mode-line-modes "%5lā†‘%3cā†’%6iā‡†" - (:eval (number-to-string (count-lines (point-min) (point-max)))) + (:eval + (number-to-string (count-lines (point-min) (point-max)))) "ā†“" mode-line-percent-position))