1 files changed, 15 insertions, 9 deletions

@@ -258,10 +258,10 @@
          #'hl-line-mode)
   (:+key "C-x C-j" #'dired-jump)
   (with-eval-after-load 'dired
-    (pcase system-system
-      ('windows
+    (cl-case system-type
+      ((windows-nt ms-dos)
        (:straight w32-browser))
-      ('linux
+      (gnu/linux
        (:straight dired-open)
        (:option dired-listing-switches
                 (concat dired-listing-switches " -F")))))
@@ -398,12 +398,6 @@
     (+kmacro-recording-indicator-mode +1)
     (+kmacro-block-undo-mode +1)))
 
-(setup magit
-  ;; This setup is weird because of dependency issues
-  (:straight (transient :host github :repo "magit/transient" :branch "master")
-             (magit :host github :repo "magit/magit")
-             (git-modes :host github :repo "magit/git-modes")))
-
 (setup minibuffer
   (:require +minibuffer)
   (:with-map minibuffer-local-map
@@ -1232,6 +1226,10 @@ See also `crux-reopen-as-root-mode'."
   (:file-match (rx ".rkt" eos)
                (rx ".scm" eos)))
 
+(setup (:straight (git-modes
+                   :host github :repo "magit/git-modes"))
+  (:require git-modes))
+
 ;; (setup (:straight god-mode)
 ;;   (setq god-mode-enable-function-key-translation nil)
 ;;   (:require god-mode
@@ -1330,6 +1328,8 @@ See also `crux-reopen-as-root-mode'."
   (:with-mode emacs-lisp-mode
     (:bind "C-c e" #'macrostep-expand)))
 
+(setup (:straight (magit :host github :repo "magit/magit")))
+
 (setup (:straight marginalia)
   (marginalia-mode +1))
 
@@ -1723,3 +1723,9 @@ See also `crux-reopen-as-root-mode'."
   (:require +zzz-to-char)
   (:option zzz-to-char-reach (+bytes 1 :kib))
   (:global "M-z" #'+zzz-to-char))
+
+(setup (:straight (machine
+                   :host github :repo "duckwork/machine.el"))
+  (:option machine-default-font "DejaVu Sans Mono"
+           machine-variable-pitch-font "DejaVu Sans")
+  (machine-settings-load))