diff options
-rw-r--r-- | early-init.el | 76 | ||||
-rw-r--r-- | init.el | 8 |
2 files changed, 33 insertions, 51 deletions
diff --git a/early-init.el b/early-init.el index 9e410b1..bb6454e 100644 --- a/early-init.el +++ b/early-init.el | |||
@@ -26,24 +26,22 @@ | |||
26 | (require 'acdw-frame) | 26 | (require 'acdw-frame) |
27 | 27 | ||
28 | ;;; Frame settings | 28 | ;;; Frame settings |
29 | (setq default-frame-alist ; Remove most UI | 29 | (setq default-frame-alist |
30 | `((tool-bar-lines . 0) ; No tool bar | 30 | `((tool-bar-lines . 0) |
31 | (menu-bar-lines . 0) ; No menu bar | 31 | (menu-bar-lines . 0) |
32 | (vertical-scroll-bars) ; No scroll bars | 32 | (vertical-scroll-bars . nil) |
33 | (horizontal-scroll-bars) ; ... at all | 33 | (horizontal-scroll-bars . nil) |
34 | (width . 84) ; A /little/ wider than | 34 | (width . 84) |
35 | ; `fill-column' (set later) | ||
36 | (height . 30) | 35 | (height . 30) |
37 | (left-fringe . 8) ; Width of fringes | 36 | (left-fringe . 8) |
38 | (right-fringe . 8) ; (8 is default) | 37 | (right-fringe . 8) |
39 | (font . ,(acdw/system | 38 | (font . ,(acdw/system |
40 | (:home "DejaVu Sans Mono 10") | 39 | (:home "DejaVu Sans Mono 10") |
41 | (:work "Consolas 12") | 40 | (:work "Consolas 12") |
42 | (:other "monospace 10")))) | 41 | (:other "monospace 10")))) |
43 | frame-inhibit-implied-resize t ; Don't resize randomly | 42 | frame-inhibit-implied-resize t |
44 | frame-resize-pixelwise t ; Resize by pixels, not chars | 43 | frame-resize-pixelwise t |
45 | inhibit-x-resources t ; Don't load ~/.Xresources | 44 | inhibit-x-resources t) |
46 | ) | ||
47 | 45 | ||
48 | (add-hook 'after-init-hook | 46 | (add-hook 'after-init-hook |
49 | (defun after-init@disable-ui-modes () | 47 | (defun after-init@disable-ui-modes () |
@@ -64,26 +62,23 @@ say, `tool-bar-mode' once to toggle the tool bar back on." | |||
64 | (add-hook 'after-make-frame-functions | 62 | (add-hook 'after-make-frame-functions |
65 | (defun after-make-frame@setup (&rest args) | 63 | (defun after-make-frame@setup (&rest args) |
66 | (ignore args) | 64 | (ignore args) |
67 | (let ((monospace-faces | 65 | (let ((fixed-pitch-faces |
68 | ;; (acdw/system | ||
69 | ;; (:work '((:font "Consolas" :height 110) | ||
70 | ;; (:font "DejaVu Sans Mono" :height 110) | ||
71 | ;; (:font "monospace" :height 110))) | ||
72 | ;; (_ '((:font "DejaVu Sans Mono" :height 100) | ||
73 | ;; (:font "Consolas" :height 100) | ||
74 | ;; (:font "monospace" :height 100)))) | ||
75 | '((:font "Fantasque Sans Mono" :height 110) | 66 | '((:font "Fantasque Sans Mono" :height 110) |
76 | (:font "Go Mono" :height 100) | 67 | (:font "Go Mono" :height 100) |
77 | (:font "DejaVu Sans Mono" :height 110) | 68 | (:font "DejaVu Sans Mono" :height 110) |
78 | (:font "monospace" :height 100)))) | 69 | (:font "monospace" :height 100))) |
79 | (acdw/set-first-face-attribute 'default monospace-faces) | 70 | (variable-pitch-faces |
80 | (acdw/set-first-face-attribute 'fixed-pitch monospace-faces) | 71 | '((:font "Comic Neue" :height 125) |
72 | (:font "Inter" :height 120) | ||
73 | (:font "Go" :height 120) | ||
74 | (:font "sans-serif" | ||
75 | :height 100)))) | ||
76 | (acdw/set-first-face-attribute 'default | ||
77 | fixed-pitch-faces) | ||
78 | (acdw/set-first-face-attribute 'fixed-pitch | ||
79 | fixed-pitch-faces) | ||
81 | (acdw/set-first-face-attribute 'variable-pitch | 80 | (acdw/set-first-face-attribute 'variable-pitch |
82 | '((:font "Comic Neue" :height 125) | 81 | variable-pitch-faces)) |
83 | (:font "Inter" :height 120) | ||
84 | (:font "Go" :height 120) | ||
85 | (:font "sans-serif" | ||
86 | :height 100)))) | ||
87 | (acdw/set-emoji-fonts "Noto Color Emoji" | 82 | (acdw/set-emoji-fonts "Noto Color Emoji" |
88 | "Noto Emoji" | 83 | "Noto Emoji" |
89 | "Segoe UI Emoji" | 84 | "Segoe UI Emoji" |
@@ -125,22 +120,7 @@ say, `tool-bar-mode' once to toggle the tool bar back on." | |||
125 | 120 | ||
126 | ;;; Bootstrap package manager (`straight.el') | 121 | ;;; Bootstrap package manager (`straight.el') |
127 | 122 | ||
128 | ;; 1. Update `exec-path'. | 123 | ;; Set `package' and `straight' variables. |
129 | (dolist (path (list (expand-file-name "bin" user-emacs-directory) | ||
130 | (expand-file-name "~/bin") | ||
131 | (expand-file-name "~/.local/bin") | ||
132 | (expand-file-name "~/usr/bin") | ||
133 | (expand-file-name "~/cmd") | ||
134 | (expand-file-name "~/mingw64/bin") | ||
135 | (expand-file-name "~/clisp-2.49")) | ||
136 | exec-path) | ||
137 | (when (file-exists-p path) | ||
138 | (add-to-list 'exec-path path :append))) | ||
139 | |||
140 | ;; 1.5. Update $PATH to reflect changes. | ||
141 | (setenv "PATH" (mapconcat #'identity exec-path path-separator)) | ||
142 | |||
143 | ;; 2. Set `package' and `straight' variables. | ||
144 | (setq package-enable-at-startup nil | 124 | (setq package-enable-at-startup nil |
145 | package-quickstart nil | 125 | package-quickstart nil |
146 | straight-host-usernames '((github . "duckwork") | 126 | straight-host-usernames '((github . "duckwork") |
@@ -148,7 +128,7 @@ say, `tool-bar-mode' once to toggle the tool bar back on." | |||
148 | straight-base-dir (acdw/dir) | 128 | straight-base-dir (acdw/dir) |
149 | straight-check-for-modifications '(check-on-save find-when-checking)) | 129 | straight-check-for-modifications '(check-on-save find-when-checking)) |
150 | 130 | ||
151 | ;; 3. Bootstrap `straight'. | 131 | ;; Bootstrap `straight'. |
152 | (defvar bootstrap-version) | 132 | (defvar bootstrap-version) |
153 | (let ((bootstrap-file | 133 | (let ((bootstrap-file |
154 | (expand-file-name | 134 | (expand-file-name |
@@ -189,7 +169,9 @@ say, `tool-bar-mode' once to toggle the tool bar back on." | |||
189 | ;; These packages are here because they need to be loaded /before/ | 169 | ;; These packages are here because they need to be loaded /before/ |
190 | ;; everything else in init.el. | 170 | ;; everything else in init.el. |
191 | 171 | ||
192 | (straight-use-package '(setup :host nil :repo "https://git.sr.ht/~pkal/setup")) | 172 | (straight-use-package '(setup |
173 | :host nil | ||
174 | :repo "https://git.sr.ht/~pkal/setup")) | ||
193 | (require 'setup) | 175 | (require 'setup) |
194 | (require 'acdw-setup) | 176 | (require 'acdw-setup) |
195 | 177 | ||
diff --git a/init.el b/init.el index d19d715..6d1eb92 100644 --- a/init.el +++ b/init.el | |||
@@ -1243,8 +1243,8 @@ specific to most general, they are these: | |||
1243 | (crux-reopen-as-root-mode +1)) | 1243 | (crux-reopen-as-root-mode +1)) |
1244 | 1244 | ||
1245 | (setup (:straight-if (define-repeat-map | 1245 | (setup (:straight-if (define-repeat-map |
1246 | :host nil | 1246 | :host nil |
1247 | :repo "https://tildegit.org/acdw/define-repeat-map.el") | 1247 | :repo "https://tildegit.org/acdw/define-repeat-map.el") |
1248 | (acdw/system :home)) | 1248 | (acdw/system :home)) |
1249 | 1249 | ||
1250 | (defun acdw/other-window-or-switch-buffer-backward () | 1250 | (defun acdw/other-window-or-switch-buffer-backward () |
@@ -1883,8 +1883,8 @@ the default is \"/\"." | |||
1883 | for n from 0 | 1883 | for n from 0 |
1884 | collect (el-patch-swap | 1884 | collect (el-patch-swap |
1885 | (org-add-props | 1885 | (org-add-props |
1886 | head nil '`face | 1886 | head nil '`face |
1887 | (nth (% n org-n-level-faces) org-level-faces)) | 1887 | (nth (% n org-n-level-faces) org-level-faces)) |
1888 | head)) | 1888 | head)) |
1889 | separator)))) | 1889 | separator)))) |
1890 | (when (> (length fpath) width) | 1890 | (when (> (length fpath) width) |