about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2020-09-17 08:00:12 -0500
committerCase Duckworth2020-09-17 08:00:12 -0500
commit62c92ed317ba4a474c9a71cbdc84ffa839a89221 (patch)
treebf1154be9cc08b0e4e9d8814145fe11e06a90bad
parentAdd eshell-syntax-highlighting (diff)
parentChange fonts to dynamic-fonts (diff)
downloademacs-62c92ed317ba4a474c9a71cbdc84ffa839a89221.tar.gz
emacs-62c92ed317ba4a474c9a71cbdc84ffa839a89221.zip
Merge branch 'master' of git.sr.ht:~acdw/.emacs.d into master
-rw-r--r--early-init.el9
-rw-r--r--init.el47
2 files changed, 39 insertions, 17 deletions
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 @@
17;;(setq debug-on-error t) 17;;(setq debug-on-error t)
18 18
19;;; different platforms 19;;; different platforms
20(setq acdw/at-work (eq system-type 'windows-nt)) 20(defconst *acdw/at-work* (eq system-type 'windows-nt))
21(setq acdw/at-larry (string= (system-name) "larry")) 21(defconst *acdw/at-larry* (string= (system-name) "larry"))
22(setq acdw/at-bax (string= (system-name) "bax")) 22(defconst *acdw/at-bax* (string= (system-name) "bax"))
23(defconst *acdw/at-home* (or *acdw/at-larry* *acdw/at-bax*))
23 24
24;; this needs to be before bootstrapping straight.el 25;; this needs to be before bootstrapping straight.el
25(when acdw/at-work 26(when *acdw/at-work*
26 (add-to-list 'exec-path "~/bin") 27 (add-to-list 'exec-path "~/bin")
27 (add-to-list 'exec-path "C:/Users/aduckworth/Downloads/PortableGit/bin")) 28 (add-to-list 'exec-path "C:/Users/aduckworth/Downloads/PortableGit/bin"))
28 29
diff --git a/init.el b/init.el index 8c0e43d..128e364 100644 --- a/init.el +++ b/init.el
@@ -10,9 +10,7 @@
10 (setq calendar-longitude -91.83) 10 (setq calendar-longitude -91.83)
11 11
12 (setq browse-url-browser-function 'browse-url-generic) 12 (setq browse-url-browser-function 'browse-url-generic)
13 (setq browse-url-generic-program "firefox") 13 (setq browse-url-generic-program "firefox"))
14
15 (set-face-attribute 'default nil :family "Fira Code" :height 110))
16 14
17(use-package no-littering 15(use-package no-littering
18 :config 16 :config
@@ -44,7 +42,7 @@
44(use-package better-defaults 42(use-package better-defaults
45 :demand 43 :demand
46 :config ; add other "better defaults" of my own 44 :config ; add other "better defaults" of my own
47 (when acdw/at-larry 45 (when *acdw/at-larry*
48 (setq visible-bell nil)) 46 (setq visible-bell nil))
49 47
50 (auto-save-mode) 48 (auto-save-mode)
@@ -112,6 +110,7 @@
112 ([remap split-window-right] . split-and-follow-right) 110 ([remap split-window-right] . split-and-follow-right)
113 111
114 :hook 112 :hook
113 (prog-mode-hook . prettify-symbols-mode)
115 (auto-save-hook . full-auto-save) 114 (auto-save-hook . full-auto-save)
116 (focus-out-hook . full-auto-save) 115 (focus-out-hook . full-auto-save)
117 (before-save-hook . delete-trailing-whitespace)) 116 (before-save-hook . delete-trailing-whitespace))
@@ -127,7 +126,7 @@
127 126
128;; start the server when at home 127;; start the server when at home
129 128
130(if (not acdw/at-work) 129(if *acdw/at-home*
131 (server-start)) 130 (server-start))
132 131
133;;; quality-of-life improvements 132;;; quality-of-life improvements
@@ -179,6 +178,8 @@
179(use-package selectrum 178(use-package selectrum
180 :config 179 :config
181 (ido-mode -1) ;; not sure why this is necessary 180 (ido-mode -1) ;; not sure why this is necessary
181 (setq enable-recursive-minibuffers t)
182 (minibuffer-depth-indicate-mode)
182 (selectrum-mode 1)) 183 (selectrum-mode 1))
183 184
184(use-package prescient) 185(use-package prescient)
@@ -200,12 +201,12 @@
200 (prog-mode-hook . aggressive-indent-mode)) 201 (prog-mode-hook . aggressive-indent-mode))
201 202
202(use-package magit 203(use-package magit
203 :if (not acdw/at-work) 204 :if *acdw/at-home*
204 :bind 205 :bind
205 ("C-x g" . magit)) 206 ("C-x g" . magit))
206 207
207(use-package forge 208(use-package forge
208 :if (not acdw/at-work) 209 :if *acdw/at-home*
209 :after magit 210 :after magit
210 :custom 211 :custom
211 (forge-owned-accounts '(("duckwork")))) 212 (forge-owned-accounts '(("duckwork"))))
@@ -234,7 +235,7 @@
234 ("C-h F" . helpful-function) 235 ("C-h F" . helpful-function)
235 ("C-h C" . helpful-command)) 236 ("C-h C" . helpful-command))
236 237
237(unless acdw/at-work 238(when *acdw/at-home*
238 (use-package su 239 (use-package su
239 :config 240 :config
240 (su-mode)) 241 (su-mode))
@@ -274,11 +275,30 @@
274 275
275;;; theming and looks 276;;; theming and looks
276 277
278(use-package dynamic-fonts
279 :init
280 (setq dynamic-fonts-preferred-monospace-fonts
281 '("Iosevka Term Slab"
282 "Consolas"
283 "Fira Code"
284 "DejaVu Sans Mono"
285 "Courier"
286 "Fixed"))
287 (setq dynamic-fonts-preferred-monospace-point-size 11)
288 (setq dynamic-fonts-preferred-proportional-fonts
289 '("DejaVu Sans"
290 "Georgia"
291 "Times New Roman"
292 "Times"))
293 (setq dynamic-fonts-preferred-proportional-point-size 12)
294 :config
295 (dynamic-fonts-setup))
296
277(use-package doom-modeline 297(use-package doom-modeline
278 :init 298 :init
279 (setq doom-modeline-icon nil) 299 (setq doom-modeline-icon nil)
280 (setq doom-modeline-enable-word-count t) 300 (setq doom-modeline-enable-word-count t)
281 (when acdw/at-larry 301 (when *acdw/at-larry*
282 (setq display-time-format "%R") 302 (setq display-time-format "%R")
283 (display-time-mode)) 303 (display-time-mode))
284 :hook 304 :hook
@@ -321,12 +341,12 @@
321 (enable-theme 'modus-operandi) 341 (enable-theme 'modus-operandi)
322 (start-process-shell-command "light" nil "light -S 60")) 342 (start-process-shell-command "light" nil "light -S 60"))
323 343
324 (if acdw/at-work 344 (if *acdw/at-work*
325 (enable-theme 'modus-operandi) 345 (enable-theme 'modus-operandi)
326 (run-at-time (nth 1 (split-string (sunrise-sunset))) 346 (run-at-time (nth 1 (split-string (sunrise-sunset)))
327 (* 60 60 24) #'acdw/sunrise))) 347 (* 60 60 24) #'acdw/sunrise)))
328 348
329(unless acdw/at-work 349(when *acdw/at-home*
330 (use-package modus-vivendi-theme 350 (use-package modus-vivendi-theme
331 :if window-system 351 :if window-system
332 :config 352 :config
@@ -395,7 +415,7 @@
395 (elpher-go (match-string 1))))) 415 (elpher-go (match-string 1)))))
396 416
397;;; exwm ~ Emacs X Window Manager 417;;; exwm ~ Emacs X Window Manager
398(when acdw/at-larry 418(when *acdw/at-larry*
399 (use-package exwm 419 (use-package exwm
400 :if window-system 420 :if window-system
401 :demand 421 :demand
@@ -489,10 +509,11 @@
489 509
490 (use-package exwm-edit) 510 (use-package exwm-edit)
491 511
492 ) ;; end of acdw/at-larry block for exwm 512 ) ;; end of *acdw/at-larry* block for exwm
493 513
494;;; other applications 514;;; other applications
495(use-package circe 515(use-package circe
516 :if *acdw/at-larry*
496 :init 517 :init
497 (defun my/fetch-password (&rest params) 518 (defun my/fetch-password (&rest params)
498 "Fetch a password from auth-sources" 519 "Fetch a password from auth-sources"