diff options
author | Case Duckworth | 2022-01-04 14:42:26 -0600 |
---|---|---|
committer | Case Duckworth | 2022-01-04 14:42:26 -0600 |
commit | 7c76d024bf10e7115c36de4affbc2db8a2a5dba3 (patch) | |
tree | fd304fc07066a106fdfa014234162f128139b78d /early-init.el | |
parent | A few various changes: typos and bugs (diff) | |
download | emacs-7c76d024bf10e7115c36de4affbc2db8a2a5dba3.tar.gz emacs-7c76d024bf10e7115c36de4affbc2db8a2a5dba3.zip |
Add system.el
Diffstat (limited to 'early-init.el')
-rw-r--r-- | early-init.el | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/early-init.el b/early-init.el index 462643a..1917779 100644 --- a/early-init.el +++ b/early-init.el | |||
@@ -52,41 +52,63 @@ See `no-littering' for examples.") | |||
52 | (+define-dir sync/ (expand-file-name "~/Sync") | 52 | (+define-dir sync/ (expand-file-name "~/Sync") |
53 | "My Syncthing directory.") | 53 | "My Syncthing directory.") |
54 | 54 | ||
55 | ;; Load system-specific changes. | ||
56 | (progn (require 'system) | ||
57 | (setq system-load-directory (sync/ "emacs/systems/" t)) | ||
58 | (system-settings-load nil :nowarn)) | ||
59 | |||
55 | ;;; Default frame settings | 60 | ;;; Default frame settings |
56 | 61 | ||
57 | (setq default-frame-alist '((tool-bar-lines . 0) | 62 | (setq default-frame-alist '((tool-bar-lines . 0) |
58 | (menu-bar-lines . 0) | 63 | (menu-bar-lines . 0) |
59 | (vertical-scroll-bars) | 64 | (vertical-scroll-bars) |
60 | (horizontal-scroll-bars)) | 65 | (horizontal-scroll-bars)) |
61 | frame-inhibit-implied-resize t | 66 | frame-inhibit-implied-resize t |
62 | frame-resize-pixelwise t | 67 | frame-resize-pixelwise t |
63 | window-resize-pixelwise t | 68 | window-resize-pixelwise t |
64 | inhibit-x-resources t | 69 | inhibit-x-resources t |
65 | indicate-empty-lines nil | 70 | indicate-empty-lines nil |
66 | indicate-buffer-boundaries '((top . right) | 71 | indicate-buffer-boundaries '((top . right) |
67 | (bottom . right))) | 72 | (bottom . right))) |
73 | |||
74 | ;;; Fonts | ||
68 | 75 | ||
69 | ;; Fonts | 76 | ;; Set default faces |
70 | 77 | ||
71 | (let ((font-name "DejaVu Sans Mono") | 78 | (let ((font-name system-default-font) |
72 | (font-size 105) | 79 | (font-size system-default-height) |
73 | (variable-font-name "DejaVu Sans") | 80 | (variable-font-name system-variable-pitch-font) |
74 | (variable-font-size 1.0)) | 81 | (variable-font-size system-variable-pitch-height)) |
75 | (set-face-attribute 'default nil :family font-name | 82 | (set-face-attribute 'default nil :family system-default-font |
76 | :height font-size :weight 'book) | 83 | :height font-size :weight 'book) |
77 | (set-face-attribute 'italic nil :family font-name | 84 | (set-face-attribute 'italic nil :family font-name |
78 | :height font-size :slant 'italic) | 85 | :height font-size :slant 'italic) |
79 | (set-face-attribute 'variable-pitch nil :family variable-font-name | 86 | (set-face-attribute 'variable-pitch nil :family variable-font-name |
80 | :height variable-font-size)) | 87 | :height variable-font-size)) |
81 | 88 | ||
89 | ;; Emoji fonts | ||
90 | |||
91 | (let ((ffl (font-family-list))) | ||
92 | (dolist (font '("Noto Color Emoji" | ||
93 | "Noto Emoji" | ||
94 | "Segoe UI Emoji" | ||
95 | "Apple Color Emoji" | ||
96 | "FreeSans" | ||
97 | "FreeMono" | ||
98 | "FreeSerif" | ||
99 | "Unifont" | ||
100 | "Symbola")) | ||
101 | (when (member font ffl) | ||
102 | (set-fontset-font t 'symbol (font-spec :family font) nil :append)))) | ||
103 | |||
82 | ;;; Packages | 104 | ;;; Packages |
83 | 105 | ||
84 | (setq package-enable-at-startup nil | 106 | (setq package-enable-at-startup nil |
85 | package-quickstart nil | 107 | package-quickstart nil |
86 | straight-host-usernames '((github . "duckwork") | 108 | straight-host-usernames '((github . "duckwork") |
87 | (gitlab . "acdw")) | 109 | (gitlab . "acdw")) |
88 | straight-check-for-modifications '(check-on-save | 110 | straight-check-for-modifications '(check-on-save |
89 | find-when-checking)) | 111 | find-when-checking)) |
90 | 112 | ||
91 | (setq no-littering-etc-directory .etc | 113 | (setq no-littering-etc-directory .etc |
92 | no-littering-var-directory .etc | 114 | no-littering-var-directory .etc |
@@ -117,8 +139,8 @@ See `no-littering' for examples.") | |||
117 | (require 'straight-x) | 139 | (require 'straight-x) |
118 | 140 | ||
119 | (dolist (pkg '(el-patch | 141 | (dolist (pkg '(el-patch |
120 | no-littering | 142 | no-littering |
121 | setup)) | 143 | setup)) |
122 | (straight-use-package pkg) | 144 | (straight-use-package pkg) |
123 | (require pkg) | 145 | (require pkg) |
124 | (require (intern (format "+%s" pkg)) nil :noerror)) | 146 | (require (intern (format "+%s" pkg)) nil :noerror)) |
@@ -137,4 +159,3 @@ See `no-littering' for examples.") | |||
137 | 159 | ||
138 | (provide 'early-init) | 160 | (provide 'early-init) |
139 | ;;; early-init.el ends here | 161 | ;;; early-init.el ends here |
140 | |||