From 769b66ef040d97902b383dd1df76b2fb581ca5f5 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Fri, 24 Nov 2023 22:54:52 +0100
Subject: [PATCH] .

---
 chicken/chicken.nix |  4 ++++
 emacs/emacs.nix     |  1 +
 emacs/init.el       | 21 ++++++++++-----------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/chicken/chicken.nix b/chicken/chicken.nix
index ed13837..f726084 100644
--- a/chicken/chicken.nix
+++ b/chicken/chicken.nix
@@ -2,6 +2,8 @@
 
 {
   config.home.packages = with pkgs.chickenPackages_5.chickenEggs; [
+    apropos
+    chicken-doc
     chicken-update
     csm
     edn
@@ -9,6 +11,8 @@
     mistie
     nanomsg
     r7rs
+    srfi-1
+    srfi-18
     srfi-197
   ] ++  [ pkgs.chicken ];
 }
diff --git a/emacs/emacs.nix b/emacs/emacs.nix
index ba06727..76c11e2 100644
--- a/emacs/emacs.nix
+++ b/emacs/emacs.nix
@@ -46,6 +46,7 @@
       evil-snipe
       forge
       geiser
+      geiser-chicken
       git-gutter
       goto-chg
       guix
diff --git a/emacs/init.el b/emacs/init.el
index f8ea9cf..504e498 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -603,26 +603,25 @@ Point must be at the beginning of balanced expression (sexp)."
     (kbd "<localleader>ce") #'cider-eval-sexp-at-point))
 
 ;;;;; Chicken Scheme
+(use-package scheme
+  :config
+  (eval-after-load 'eglot
+    '(add-to-list 'eglot-server-programs
+                  '(scheme-mode . ("chicken-lsp-server"))))
+  :hook
+  (scheme-mode . eglot-ensure))
+
 (defun flymake-chicken-init ()
   (add-hook 'flymake-diagnostic-functions
             #'flymake-chicken-backend nil t)
   (flymake-mode))
 
 (use-package geiser
+  :custom
+  (geiser-chicken-match-limit 200)
   :config
   (defalias 'run-geiser 'geiser))
 
-(use-package lsp-scheme
-  :autoload lsp-scheme-chicken
-  :hook
-  (scheme-mode . lsp-scheme)
-  :custom
-  (lsp-scheme-implementation "chicken")
-  :config
-  (progn (add-to-list 'eglot-server-programs
-                      '(scheme-mode . ("chicken-lsp-server"))))
-  (require 'lsp-scheme))
-
 ;; (use-package flymake-chicken
 ;;   :hook
 ;;   ((scheme-mode . flymake-chicken-init)