diff --git a/oni-scheme.el b/oni-scheme.el
index a53934f..f18fc98 100644
--- a/oni-scheme.el
+++ b/oni-scheme.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0106.200514
-;; Package-Requires: (oni-company oni-paredit oni-fci rainbow-delimiters)
+;; Version: 2020.0719.203126
+;; Package-Requires: (oni-company oni-paredit oni-fci rainbow-delimiters geiser)
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@
 
 ;;; Code:
 
+(require 'geiser)
+
 (defun oni-scheme--auto-fill-mode ()
   "Enable ‘auto-fill-mode’ only for comments."
   (setq-local comment-auto-fill-only-comments t)
@@ -37,6 +39,13 @@
 (add-hook 'scheme-mode-hook 'rainbow-delimiters-mode)
 (add-hook 'scheme-mode-hook 'oni-scheme--auto-fill-mode)
 
+(add-hook 'geiser-repl-mode-hook 'paredit-mode)
+
+(setq geiser-default-implementation 'guile)
+
+(setq geiser-repl-history-filename
+      (expand-file-name "data/geiser-history" user-emacs-directory))
+
 ;;;###autoload
 (add-to-list 'interpreter-mode-alist '("scsh" . scheme-mode))