From 1de0b1131fde5ade8003de26221b747c107511e6 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej@sosek.net>
Date: Tue, 14 Apr 2026 09:07:49 +0300
Subject: [PATCH] Small update

---
 lisp/icejam-base.el            | 4 +++-
 lisp/icejam-eglot.el           | 5 +++++
 lisp/icejam-fonts.el           | 2 +-
 lisp/langs/icejam-lang-ruby.el | 4 +++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lisp/icejam-base.el b/lisp/icejam-base.el
index a8150e5..aebda6a 100644
--- a/lisp/icejam-base.el
+++ b/lisp/icejam-base.el
@@ -107,6 +107,9 @@
 ;; Disable warning related to PATH on startup
 (defvar exec-path-from-shell-check-startup-files nil)
 
+(eval-when-compile
+  (declare-function exec-path-from-shell-initialize 'exec-path-from-shell))
+
 ;; Allow to execute path from shell
 (use-package exec-path-from-shell
   ;; :if (memq window-system '(x mac ns))
@@ -114,7 +117,6 @@
   :defer t
   :hook ((elpaca-after-init . exec-path-from-shell-initialize))
   :config
-  (declare-function exec-path-from-shell-initialize "exec-path-from-shell")
   (add-to-list 'exec-path "/usr/local/bin")
   (dolist (var '("DEFT_PATH"
                  "LANG"
diff --git a/lisp/icejam-eglot.el b/lisp/icejam-eglot.el
index bd838a4..177036a 100644
--- a/lisp/icejam-eglot.el
+++ b/lisp/icejam-eglot.el
@@ -3,6 +3,11 @@
 ;;; Global Language Server Protocol Config
 ;;; Code:
 
+(use-package eglot :ensure nil
+  :config
+  ;; Use Ruby-Lsp instead of Solargraph
+  (add-to-list 'eglot-server-programs '((ruby-mode ruby-ts-mode) "ruby-lsp")))
+
 (use-package eldoc-box
   :ensure (:host github :repo "casouri/eldoc-box")
   :hook ((emacs-lisp-mode . eldoc-box-hover-at-point-mode)
diff --git a/lisp/icejam-fonts.el b/lisp/icejam-fonts.el
index 1515d58..55418d0 100644
--- a/lisp/icejam-fonts.el
+++ b/lisp/icejam-fonts.el
@@ -34,7 +34,7 @@ It is different than default font to keep it visually distinct.")
 
 ;; Require dash functions to be included:
 (eval-when-compile
-  (declare-function -> "dash.el"))
+  (declare-function -> 'dash))
 
 (defconst icejam-font-height 14
   "Default height of then font.
diff --git a/lisp/langs/icejam-lang-ruby.el b/lisp/langs/icejam-lang-ruby.el
index e69fb8f..9d0f89d 100644
--- a/lisp/langs/icejam-lang-ruby.el
+++ b/lisp/langs/icejam-lang-ruby.el
@@ -4,6 +4,8 @@
 
 (eval-when-compile
   (defvar icejam-language-transient-alist)
+  (defvar eglot-server-programs)
+  (defvar ruby-insert-encoding-magic-comment)
   (declare-function icejam-set-indent 'icejam-prog-mode)
   (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
 
@@ -21,7 +23,7 @@
   (add-to-list (make-local-variable 'flycheck-disabled-checkers) 'ruby-reek 'ruby-rubocop)
 
   ;; Do not insert magic encoding comment at the begining of each file
-  (setq ruby-insert-encoding-magic-comment nil)
+  (setopt ruby-insert-encoding-magic-comment nil)
 
   ;; Start LSP
   (eglot-ensure)