diff --git a/bundle/bundle--lisp.el b/bundle/bundle--lisp.el
index c190b368..7d43520b 100644
--- a/bundle/bundle--lisp.el
+++ b/bundle/bundle--lisp.el
@@ -332,3 +332,32 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
 
 (use-package common-lisp-snippets
   :after yasnippet)
+
+(use-package geiser
+  :init
+  (setq geiser-repl-prompt-read-only t)
+  (setq geiser-repl-highlight-error-messages t)
+  (if (eq system-type 'windows-nt)
+      (progn
+        (setq geiser-active-implementations '(racket))
+        (setq geiser-default-implementation 'racket))
+    (progn
+      (setq geiser-active-implementations '(racket guile))
+      (setq geiser-default-implementation 'guile)))
+  :hook (scheme-mode . geiser-mode))
+
+(use-package racket-mode
+  :mode "\\.rkt\\'")
+
+(use-package geiser-racket
+  :defer t
+  :after geiser
+  :config
+  (when (eq system-type 'windows-nt)
+    (setq geiser-racket-binary "c:/Program Files/Racket/Racket.exe")))
+
+(when (eq system-type 'gnu/linux)
+  (use-package geiser-guile
+    :defer t
+    :after geiser
+    :custom (geiser-guile-binary "guile")))
diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el
index dbb4546c..e4e7960a 100644
--- a/bundle/bundle--package.el
+++ b/bundle/bundle--package.el
@@ -218,40 +218,11 @@
 ;;   :hook (typescript-mode . eglot-ensure)
 ;;   :config (setq typescript-indent-level 2))
 
-(use-package geiser
-  :defer t
-  :init
-  (setq geiser-repl-prompt-read-only t)
-  (setq geiser-repl-highlight-error-messages t)
-  (if (eq system-type 'windows-nt)
-      (progn
-        (setq geiser-active-implementations '(racket))
-        (setq geiser-default-implementation 'racket))
-    (progn
-      (setq geiser-active-implementations '(racket guile))
-      (setq geiser-default-implementation 'guile)))
-  :hook (scheme-mode . geiser-mode))
-
-(use-package racket-mode
-  :mode "\\.rkt\\'")
-
-(use-package geiser-racket
-  :defer t
-  :after geiser
-  :config
-  (when (eq system-type 'windows-nt)
-    (setq geiser-racket-binary "c:/Program Files/Racket/Racket.exe")))
-
 (when (eq system-type 'gnu/linux)
   (use-package spotify :bind ("S-<pause>" . spotify-playpause))
   ;; (use-package clojure-mode)
   ;; (use-package cider)
 
-  (use-package geiser-guile
-    :defer t
-    :after geiser
-    :custom (geiser-guile-binary "guile"))
-
   (use-package journalctl-mode
     :commands journalctl
     :bind (("C-c t j" . journalctl))))