From 848e40ef6e8bec2443e81e65d9b9f23cf53259a6 Mon Sep 17 00:00:00 2001
From: tslil clingman <>
Date: Tue, 23 Jan 2024 22:06:24 +0100
Subject: [emacs] switch to eglot away from lsp

---
 emacs/inits/20-programming.el | 55 +++++++++++++++++++++----------------------
 emacs/inits/21-functional.el  |  6 ++---
 2 files changed, 29 insertions(+), 32 deletions(-)

(limited to 'emacs')

diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el
index 520325a..4ec41b6 100644
--- a/emacs/inits/20-programming.el
+++ b/emacs/inits/20-programming.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-01-10 14h20 CET (anker)>
+;; Time-stamp: <2024-01-23 22h05 CET (1c015732)>
 
 ;; -----------------------------------------------------------------------------
 ;; General setup
@@ -20,6 +20,11 @@
   (interactive "r")
   (align-regexp begin end "\\(\\s-*\\)=" 1 1 ))
 
+(use-package eglot
+  :config
+  (add-to-list 'eglot-server-programs
+               '(bqn-mode . ("bqnlsp"))))
+
 (use-package centered-window
   :ensure t)
 
@@ -78,13 +83,6 @@
         electric-pair-skip-whitespace t
         electric-pair-inhibit-predicate 'electric-pair-default-inhibit))
 
-(use-package lsp-mode
-  :ensure t
-  :defer t
-  :init
-  (setq lsp-keymap-prefix "M-l"
-        lsp-warn-no-matched-clients nil))
-
 ;; -----------------------------------------------------------------------------
 ;; C
 
@@ -105,7 +103,7 @@
                                ;; (aggressive-indent-mode)
                                (set-fill-column 80)
                                (abbrev-mode 0)
-                               (lsp) ;; clangd seems pretty good!
+                               (eglot-ensure) ;; clangd seems pretty good!
                                (c-toggle-hungry-state 1)
                                (c-toggle-electric-state 1)
                                (c-toggle-syntactic-indentation 1)))
@@ -226,10 +224,6 @@
   :ensure t
   :defer t)
 
-(use-package flycheck-rust
-  :ensure t
-  :defer t)
-
 (use-package rust-mode
   :ensure t
   :defer t
@@ -246,15 +240,12 @@
                        ;; Pair {} in rust format strings ... ?
                        (setq-local electric-pair-text-pairs
                                    (cons '(?{ . ?}) electric-pair-pairs))
-                       (flycheck-rust-setup)
-                       (lsp)))
+                       (eglot-ensure)))
   :config
   (setq rust-indent-offset 4
         rust-indent-method-chain t
         rust-indent-where-clause t
-        rust-format-on-save t)
-  (setq lsp-rust-server 'rust-analyzer
-        lsp-rust-analyzer-call-info-full nil))
+        rust-format-on-save t))
 
 
 ;; -------------------------------------------------------------------
@@ -277,7 +268,7 @@
 (use-package zig-mode
   :ensure t
   :defer t
-  :hook (zig-mode . (lambda () (lsp)))
+  :hook (zig-mode . (lambda () (eglot-ensure)))
   :init
   (defun my-zig-run ()
     (interactive)
@@ -290,11 +281,7 @@
               ("M-n" . end-of-defun)
               ("C-c C-c" . zig-compile)
               ("C-c r" . zig-run)
-              ("C-c C-r" . my-zig-run))
-  :config
-  (require 'lsp)
-  (setq zig-format-on-save nil
-        lsp-zig-zls-executable "/usr/bin/zls"))
+              ("C-c C-r" . my-zig-run)))
 
 ;; (use-package js-comint
 ;;   :ensure t
@@ -339,8 +326,20 @@
 ;;          ("\\.fb$" . forth-block-mode)
 ;;          ("\\.4th$" . forth-mode)))
 
-(use-package uxntal-mode
+;; (use-package uxntal-mode
+;;   :ensure t
+;;   :defer t
+;;   :config
+;;   (setq uxntal-mode-strict-comments t))
+
+(use-package uiua-ts-mode
   :ensure t
-  :defer t
-  :config
-  (setq uxntal-mode-strict-comments t))
+  :defer)
+
+(use-package bqn-mode
+  :ensure t
+  :defer
+  :bind (:map bqn-mode-map
+              ("C-c r r" . bqn-comint-eval-dwim)
+              ("C-c r b" . bqn-comint-eval-buffer))
+  :hook (bqn-mode . (lambda () (eglot-ensure))))
diff --git a/emacs/inits/21-functional.el b/emacs/inits/21-functional.el
index 1eaa104..3bec067 100644
--- a/emacs/inits/21-functional.el
+++ b/emacs/inits/21-functional.el
@@ -1,10 +1,8 @@
-;; Time-stamp: <2023-01-18 20h56 CET (anker)>
+;; Time-stamp: <2024-01-23 21h50 CET (1c015732)>
 
 ;; -----------------------------------------------------------------------------
 ;; Haskell
 
-(use-package lsp-haskell :ensure t :defer)
-
 (use-package haskell-mode
   :ensure t
   :bind (:map haskell-mode-map
@@ -26,7 +24,7 @@
                            (interactive-haskell-mode)
                            (turn-on-haskell-doc-mode)
                            (turn-on-haskell-decl-scan)
-                           (lsp)
+                           (eglot-ensure)
                            (haskell-mode-stylish-buffer))))
   :config
   (setq haskell-doc-show-global-types t
-- 
cgit v1.2.3