1 files changed, 9 insertions, 8 deletions

@@ -336,14 +336,7 @@
   ;; 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"))
-  (when (eq system-type 'gnu/linux)
-    (:straight (forge :host github :repo "magit/forge"))
-    (with-eval-after-load 'magit
-      (require 'forge)
-      (add-to-list 'forge-alist
-                   '("tildegit.org" "tildegit.org/api/v1" "tildegit.org"
-                     forge-gitea-repository)))))
+             (git-modes :host github :repo "magit/git-modes")))
 
 (setup minibuffer
   (:require +minibuffer)
@@ -897,6 +890,14 @@ See also `crux-reopen-as-root-mode'."
                    :repo "duckwork/filldent.el"))
   (:+key "M-q" #'filldent-dwim))
 
+(setup (:straight-when (forge
+                        :host github :repo "magit/forge")
+         (eq system-type 'gnu/linux))
+  (require 'forge)
+  (add-to-list 'forge-alist
+               '("tildegit.org" "tildegit.org/api/v1" "tildegit.org"
+                 forge-gitea-repository)))
+
 (setup (:straight (frowny
                    :host github
                    :repo "duckwork/frowny.el"))