Remove BSD specific config and make HEEx formatter work

lisp/icejam-copilot.el

@@ -31,7 +31,7 @@
   (gptel-make-ollama "Ollama@Linux"
     :host "192.168.88.110:11434"
     :stream t
-    :models '(qwen2.5-coder:7b qwen2.5-coder:14b))
+    :models '(qwen2.5-coder:7b qwen2.5-coder:14b deepseek-r1:14b deepseek-r1:32b))
   (setq
    gptel-model 'claude-3-5-sonnet-20241022
    gptel-backend (gptel-make-anthropic "Claude"
@@ -46,7 +46,7 @@
   ;; (setenv "OLLAMA_API_BASE" "http://127.0.0.1:11434")
   (setenv "OLLAMA_API_BASE" "http://192.168.88.110:11434")
   (setopt aider-args (list "--model"
-                           "ollama_chat/qwen2.5-coder:14b"
+                           "ollama_chat/deepseek-r1:32b"
                            "--no-auto-commits"
                            "--no-analytics"
                            "--no-gitignore")))

lisp/icejam-keys-mode.el

@@ -37,6 +37,10 @@
 (keymap-set icejam-keys-mode-map "C-c s [" #'previous-buffer)
 (keymap-set icejam-keys-mode-map "C-c s ]" #'next-buffer)
 
+;; These are slightly more conveniently located on an Ergodox/Moonlander
+(keymap-set icejam-keys-mode-map "C-c s <left>" #'previous-buffer)
+(keymap-set icejam-keys-mode-map "C-c s <right>" #'next-buffer)
+
 ;; List of buffers buffer
 (keymap-set icejam-keys-mode-map "C-c b" #'ibuffer)
 

lisp/icejam-prog-mode.el

@@ -72,5 +72,8 @@
   ;; regexp.
   (setopt vr/engine 'pcre2el))
 
+;; Format all programming languages with the same package
+(use-package apheleia :ensure t :defer t)
+
 (provide 'icejam-prog-mode)
 ;;; icejam-prog-mode.el ends here

lisp/icejam-sys-specific.el

@@ -4,7 +4,6 @@
 ;;; Code:
 
 (defconst IS-MAC (eq system-type 'darwin))
-(defconst IS-BSD (eq system-type 'berkeley-unix))
 (defconst IS-GNU (eq system-type 'gnu/linux))
 
 (eval-when-compile (defvar icejam-keys-mode-map))
@@ -70,39 +69,21 @@
 (if IS-GNU
     (progn
       ;; Save and undo
-      (keymap-set icejam-keys-mode-map (kbd "s-s") #'save-buffer)
-      (keymap-set icejam-keys-mode-map (kbd "s-z") #'undo)
-      (keymap-set icejam-keys-mode-map (kbd "s-Z") #'undo-redo)
-      (keymap-set icejam-keys-mode-map (kbd "s-a") #'mark-whole-buffer)
+      (keymap-set icejam-keys-mode-map "s-s" #'save-buffer)
+      (keymap-set icejam-keys-mode-map "s-z" #'undo)
+      (keymap-set icejam-keys-mode-map "s-Z" #'undo-redo)
+      (keymap-set icejam-keys-mode-map "s-a" #'mark-whole-buffer)
 
       ;; Copy and paste bindings
-      (keymap-set icejam-keys-mode-map (kbd "s-x") #'kill-region)
-      (keymap-set icejam-keys-mode-map (kbd "s-v") #'yank)
-      (keymap-set icejam-keys-mode-map (kbd "s-c") #'kill-ring-save)
+      (keymap-set icejam-keys-mode-map "s-x" #'kill-region)
+      (keymap-set icejam-keys-mode-map "s-v" #'yank)
+      (keymap-set icejam-keys-mode-map "s-c" #'kill-ring-save)
 
       ;; Linux Ergo bindings (fix)
-      (keymap-set icejam-keys-mode-map (kbd "C-<right>") #'end-of-line)
-      (keymap-set icejam-keys-mode-map (kbd "C-<left>") #'beginning-of-line)
-      (keymap-set icejam-keys-mode-map (kbd "C-<up>") #'scroll-down) ; WTF is this reverse, I dunno
-      (keymap-set icejam-keys-mode-map (kbd "C-<down>") #'scroll-up)))
-
-;; BSD-specific config
-(if IS-BSD
-    (progn
-      (keymap-set icejam-keys-mode-map (kbd "A-<right>") #'end-of-line)
-      (keymap-set icejam-keys-mode-map (kbd "A-<left>") #'beginning-of-line)
-      (keymap-set icejam-keys-mode-map (kbd "A-<up>") #'scroll-down) ; WTF is this reverse, I dunno
-      (keymap-set icejam-keys-mode-map (kbd "A-<down>") #'scroll-up)
-
-      (keymap-set icejam-keys-mode-map (kbd "A-a") #'mark-whole-buffer)
-      (keymap-set icejam-keys-mode-map (kbd "A-v") #'yank)
-      (keymap-set icejam-keys-mode-map (kbd "A-x") #'kill-region)
-      (keymap-set icejam-keys-mode-map (kbd "A-c") #'kill-ring-save)
-      (keymap-set icejam-keys-mode-map (kbd "A-s") #'save-buffer)
-      (keymap-set icejam-keys-mode-map (kbd "A-l") #'goto-line)
-      (keymap-set icejam-keys-mode-map (kbd "A-w") #'icejam-function-delete-window)
-      (keymap-set icejam-keys-mode-map (kbd "A-z") #'undo)
-      (keymap-set icejam-keys-mode-map (kbd "A-q") #'kill-emacs)))
+      (keymap-set icejam-keys-mode-map "C-<right>" #'end-of-line)
+      (keymap-set icejam-keys-mode-map "C-<left>" #'beginning-of-line)
+      (keymap-set icejam-keys-mode-map "C-<up>" #'scroll-down) ; WTF is this reverse, I dunno
+      (keymap-set icejam-keys-mode-map "C-<down>" #'scroll-up)))
 
 (provide 'icejam-sys-specific)
 ;;; icejam-sys-specific.el ends here

lisp/icejam-transient.el

@@ -101,6 +101,7 @@
 
     ("r" "Reload buffer" icejam-revert-buffer-no-confirm)
     ("e" "Show errors" flymake-show-buffer-diagnostics)
+    ("f" "Format buffer with apheleia formatter" apheleia-format-buffer)
 
     ;; This only appears for emacs-lisp-mode
     ("d" "Explain thing at point" helpful-at-point :if-mode emacs-lisp-mode)
@@ -108,8 +109,6 @@
     ;; These only appear for LSP mode
     ("m" "LSP iMenu" lsp-ui-imenu
      :if (lambda () (bound-and-true-p lsp-mode)))
-    ("f" "Format buffer with LSP formatter" lsp-format-buffer
-     :if (lambda () (bound-and-true-p lsp-mode)))
 
     ;; Finally, quit.
     ("q" "Quit" keyboard-quit)]])

lisp/langs/icejam-lang-elixir.el

@@ -10,17 +10,12 @@
   (declare-function yas--remove-template-by-uuid 'yasnippet)
   (declare-function icejam-set-indent 'icejam-prog-mode)
   (declare-function icejam-set-lsp-capfs 'icejam-complete-at-point)
-  (defvar icejam-language-transient-alist))
+  (defvar icejam-language-transient-alist)
+  (defvar apheleia-mode-alist))
 
-;; Only load the elixir-format from elixir mode.
-(use-package elixir-format :defer t
-  :ensure (:type git
-                 :host github
-                 :repo "elixir-editors/emacs-elixir"
-                 :files ("elixir-format.el")))
-
-(use-package elixir-ts-mode :ensure t :defer t
-  :after (elixir-format lsp-mode lsp-ui))
+(use-package elixir-ts-mode :ensure t :defer t :after (apheleia lsp-mode lsp-ui)
+  :config
+  (add-to-list 'apheleia-mode-alist '(heex-ts-mode . mix-format)))
 
 (transient-define-prefix icejam-elixir-lang-menu ()
   [[:description
@@ -31,7 +26,7 @@
     ("m" "LSP iMenu" lsp-ui-imenu)
     ("r" "Reload buffer" icejam-revert-buffer-no-confirm)
     ("e" "Show errors" flymake-show-buffer-diagnostics)
-    ("f" "Format buffer with Elixir formatter" elixir-format)
+    ("f" "Format buffer with Elixir formatter" apheleia-format-buffer)
 
     ("q" "Quit" keyboard-quit)]])
 
@@ -61,5 +56,17 @@
 (add-hook 'heex-ts-mode-hook 'icejam-activate-elixir-ts-mode)
 (add-hook 'elixir-ts-mode-hook 'icejam-activate-elixir-ts-mode)
 
+;; (use-package ert :ensure nil :defer t)
+;; (ert-deftest icejam-activate-elixir-ts-mode ()
+;;   "Test `elixir-ts-mode` activation."
+;;   (with-temp-buffer
+;;     (elixir-ts-mode)
+;;     (icejam-activate-elixir-ts-mode)
+;;     (should (eq major-mode 'elixir-ts-mode))
+;;     (should (bound-and-true-p column-enforce-mode))
+;;     (should (equal " 98col" (buffer-local-value 'column-enforce-mode-line-string
+;;                                             (current-buffer))))
+;;     (should (eq 2 (buffer-local-value 'tab-width (current-buffer))))))
+
 (provide 'icejam-lang-elixir)
 ;;; icejam-lang-elixir.el ends here

lisp/langs/icejam-lang-markdown.el

@@ -21,7 +21,7 @@
     ;; Render HTML preview with pandoc
     (setq-default markdown-command '("pandoc"
                                      "-f"
-                                     "markdown"
+                                     "markdown_mmd"
                                      "-t"
                                      "html5"
                                      "--template"