summary refs log tree commit diff stats
path: root/init.el
diff options
context:
space:
mode:
Diffstat (limited to 'init.el')
-rw-r--r--init.el24
1 files changed, 15 insertions, 9 deletions
diff --git a/init.el b/init.el index 53a8a81..93c5c1d 100644 --- a/init.el +++ b/init.el
@@ -262,10 +262,10 @@
262 #'hl-line-mode) 262 #'hl-line-mode)
263 (:+key "C-x C-j" #'dired-jump) 263 (:+key "C-x C-j" #'dired-jump)
264 (with-eval-after-load 'dired 264 (with-eval-after-load 'dired
265 (pcase system-system 265 (cl-case system-type
266 ('windows 266 ((windows-nt ms-dos)
267 (:straight w32-browser)) 267 (:straight w32-browser))
268 ('linux 268 (gnu/linux
269 (:straight dired-open) 269 (:straight dired-open)
270 (:option dired-listing-switches 270 (:option dired-listing-switches
271 (concat dired-listing-switches " -F"))))) 271 (concat dired-listing-switches " -F")))))
@@ -402,12 +402,6 @@
402 (+kmacro-recording-indicator-mode +1) 402 (+kmacro-recording-indicator-mode +1)
403 (+kmacro-block-undo-mode +1))) 403 (+kmacro-block-undo-mode +1)))
404 404
405(setup magit
406 ;; This setup is weird because of dependency issues
407 (:straight (transient :host github :repo "magit/transient" :branch "master")
408 (magit :host github :repo "magit/magit")
409 (git-modes :host github :repo "magit/git-modes")))
410
411(setup minibuffer 405(setup minibuffer
412 (:require +minibuffer) 406 (:require +minibuffer)
413 (:with-map minibuffer-local-map 407 (:with-map minibuffer-local-map
@@ -1237,6 +1231,10 @@ See also `crux-reopen-as-root-mode'."
1237 (:file-match (rx ".rkt" eos) 1231 (:file-match (rx ".rkt" eos)
1238 (rx ".scm" eos))) 1232 (rx ".scm" eos)))
1239 1233
1234(setup (:straight (git-modes
1235 :host github :repo "magit/git-modes"))
1236 (:require git-modes))
1237
1240;; (setup (:straight god-mode) 1238;; (setup (:straight god-mode)
1241;; (setq god-mode-enable-function-key-translation nil) 1239;; (setq god-mode-enable-function-key-translation nil)
1242;; (:require god-mode 1240;; (:require god-mode
@@ -1335,6 +1333,8 @@ See also `crux-reopen-as-root-mode'."
1335 (:with-mode emacs-lisp-mode 1333 (:with-mode emacs-lisp-mode
1336 (:bind "C-c e" #'macrostep-expand))) 1334 (:bind "C-c e" #'macrostep-expand)))
1337 1335
1336(setup (:straight (magit :host github :repo "magit/magit")))
1337
1338(setup (:straight marginalia) 1338(setup (:straight marginalia)
1339 (marginalia-mode +1)) 1339 (marginalia-mode +1))
1340 1340
@@ -1745,3 +1745,9 @@ See also `crux-reopen-as-root-mode'."
1745 (:require +zzz-to-char) 1745 (:require +zzz-to-char)
1746 (:option zzz-to-char-reach (+bytes 1 :kib)) 1746 (:option zzz-to-char-reach (+bytes 1 :kib))
1747 (:global "M-z" #'+zzz-to-char)) 1747 (:global "M-z" #'+zzz-to-char))
1748
1749(setup (:straight (machine
1750 :host github :repo "duckwork/machine.el"))
1751 (:option machine-default-font "DejaVu Sans Mono"
1752 machine-variable-pitch-font "DejaVu Sans")
1753 (machine-settings-load))