diff options
Diffstat (limited to 'init.el')
-rw-r--r-- | init.el | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/init.el b/init.el index 151bc69..4eb05bd 100644 --- a/init.el +++ b/init.el | |||
@@ -258,10 +258,10 @@ | |||
258 | #'hl-line-mode) | 258 | #'hl-line-mode) |
259 | (:+key "C-x C-j" #'dired-jump) | 259 | (:+key "C-x C-j" #'dired-jump) |
260 | (with-eval-after-load 'dired | 260 | (with-eval-after-load 'dired |
261 | (pcase system-system | 261 | (cl-case system-type |
262 | ('windows | 262 | ((windows-nt ms-dos) |
263 | (:straight w32-browser)) | 263 | (:straight w32-browser)) |
264 | ('linux | 264 | (gnu/linux |
265 | (:straight dired-open) | 265 | (:straight dired-open) |
266 | (:option dired-listing-switches | 266 | (:option dired-listing-switches |
267 | (concat dired-listing-switches " -F"))))) | 267 | (concat dired-listing-switches " -F"))))) |
@@ -398,12 +398,6 @@ | |||
398 | (+kmacro-recording-indicator-mode +1) | 398 | (+kmacro-recording-indicator-mode +1) |
399 | (+kmacro-block-undo-mode +1))) | 399 | (+kmacro-block-undo-mode +1))) |
400 | 400 | ||
401 | (setup magit | ||
402 | ;; This setup is weird because of dependency issues | ||
403 | (:straight (transient :host github :repo "magit/transient" :branch "master") | ||
404 | (magit :host github :repo "magit/magit") | ||
405 | (git-modes :host github :repo "magit/git-modes"))) | ||
406 | |||
407 | (setup minibuffer | 401 | (setup minibuffer |
408 | (:require +minibuffer) | 402 | (:require +minibuffer) |
409 | (:with-map minibuffer-local-map | 403 | (:with-map minibuffer-local-map |
@@ -1232,6 +1226,10 @@ See also `crux-reopen-as-root-mode'." | |||
1232 | (:file-match (rx ".rkt" eos) | 1226 | (:file-match (rx ".rkt" eos) |
1233 | (rx ".scm" eos))) | 1227 | (rx ".scm" eos))) |
1234 | 1228 | ||
1229 | (setup (:straight (git-modes | ||
1230 | :host github :repo "magit/git-modes")) | ||
1231 | (:require git-modes)) | ||
1232 | |||
1235 | ;; (setup (:straight god-mode) | 1233 | ;; (setup (:straight god-mode) |
1236 | ;; (setq god-mode-enable-function-key-translation nil) | 1234 | ;; (setq god-mode-enable-function-key-translation nil) |
1237 | ;; (:require god-mode | 1235 | ;; (:require god-mode |
@@ -1330,6 +1328,8 @@ See also `crux-reopen-as-root-mode'." | |||
1330 | (:with-mode emacs-lisp-mode | 1328 | (:with-mode emacs-lisp-mode |
1331 | (:bind "C-c e" #'macrostep-expand))) | 1329 | (:bind "C-c e" #'macrostep-expand))) |
1332 | 1330 | ||
1331 | (setup (:straight (magit :host github :repo "magit/magit"))) | ||
1332 | |||
1333 | (setup (:straight marginalia) | 1333 | (setup (:straight marginalia) |
1334 | (marginalia-mode +1)) | 1334 | (marginalia-mode +1)) |
1335 | 1335 | ||
@@ -1723,3 +1723,9 @@ See also `crux-reopen-as-root-mode'." | |||
1723 | (:require +zzz-to-char) | 1723 | (:require +zzz-to-char) |
1724 | (:option zzz-to-char-reach (+bytes 1 :kib)) | 1724 | (:option zzz-to-char-reach (+bytes 1 :kib)) |
1725 | (:global "M-z" #'+zzz-to-char)) | 1725 | (:global "M-z" #'+zzz-to-char)) |
1726 | |||
1727 | (setup (:straight (machine | ||
1728 | :host github :repo "duckwork/machine.el")) | ||
1729 | (:option machine-default-font "DejaVu Sans Mono" | ||
1730 | machine-variable-pitch-font "DejaVu Sans") | ||
1731 | (machine-settings-load)) | ||