Update 20260310

2026-03-10 08:59:04 +02:00 · 2026-03-10 08:59:04 +02:00 · 4825f2328a
commit 4825f2328a
parent 1b64c05b0f
6 changed files with 42 additions and 1223 deletions
--- a/elpaca.lock
+++ b/elpaca.lock
--- a/lisp/icejam-aider.el
+++ b/lisp/icejam-aider.el
@ -9,48 +9,6 @@
 ;;; Copilot and other GPT stuff

 ;;; Code:
-(use-package copilot :ensure (:host github :repo "copilot-emacs/copilot.el" :files ("*.el"))
-  :defer t
-  ;; It sort of sucks so let's disable it.
-  ;; :hook ((prog-mode . copilot-mode))
-  :bind (:map copilot-completion-map
-              ([tab] . copilot-accept-completion))
-  :config
-  (add-to-list 'copilot-indentation-alist '(emacs-lisp-mode . 2)))
-
-;; Enable Anthropic Claude LLM support for chat (it also sucks)
-(defcustom anthropic-api-key "api-key" "The value of your Anthropic API key."
-  :type 'string
-  :group 'icejam
-  :initialize 'custom-initialize-set)
-
-(use-package gptel :ensure t :defer t
-  :config
-  (declare-function gptel-make-anthropic "gptel")
-  (declare-function gptel-make-ollama "gptel")
-  (gptel-make-ollama "Ollama@Linux"
-    :host "192.168.88.110:11434"
-    :stream t
-    :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"
-                   :stream t :key (lambda () anthropic-api-key))))
-
-;; Pretend to be 'AI editor' vol 1. Before usage make sure aider is installed:
-;; $ pip install aider-install
-;; $ aider install
-;; (use-package aider :ensure (:host github :repo "tninja/aider.el")
-;;   :defer t
-;;   :config
-;;   ;; (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/deepseek-r1:32b"
-;;                            "--no-auto-commits"
-;;                            "--no-analytics"
-;;                            "--no-gitignore")))
-
 (use-package aidermacs :ensure (:host github :repo "MatthewZMD/aidermacs")
  :defer t
  :config
@ -64,18 +22,16 @@
                                 "--no-analytics"
                                 "--no-gitignore")))

-;; Pretend to be 'AI editor' vol 2.
-(use-package elysium :ensure t :defer t
-  :config
-  (setopt
-   ;; The elysium buffer will be 1/3 your screen
-   elysium-window-size 0.33
-   ;; Elysium buffer will be vertical
-   elysium-window-style 'vertical))
+(declare-function agent-shell-make-environment-variables 'agent-shell)

-;; Merging with SMerge
-(use-package smerge-mode :ensure nil
-  :hook ((prog-mode . smerge-mode)))
+(use-package agent-shell
+  :ensure t
+  :ensure-system-package
+  ;; Add agent installation configs here
+  ((claude-agent-acp . "npm install -g @zed-industries/claude-agent-acp"))
+  :config
+  (setopt agent-shell-anthropic-claude-environment
+          (agent-shell-make-environment-variables :inherit-env t)))

 (provide 'icejam-aider)
 ;;; icejam-aider.el ends here
--- a/lisp/icejam-base.el
+++ b/lisp/icejam-base.el
@ -112,7 +112,19 @@
  :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" "LC_CTYPE"))
+  (dolist (var '("DEFT_PATH"
+                 "LANG"
+                 "LC_CTYPE"
+                 "CLAUDE_CODE_USE_VERTEX"
+                 "CLOUD_ML_REGION"
+                 "ANTHROPIC_VERTEX_PROJECT_ID"
+                 "VERTEX_REGION_CLAUDE_3_5_HAIKU"
+                 "VERTEX_REGION_CLAUDE_3_5_SONNET"
+                 "VERTEX_REGION_CLAUDE_3_7_SONNET"
+                 "VERTEX_REGION_CLAUDE_4_0_OPUS"
+                 "VERTEX_REGION_CLAUDE_4_0_SONNET"
+                 "VERTEX_REGION_CLAUDE_4_1_OPUS"
+                 "ANTHROPIC_MODEL"))
    (add-to-list 'exec-path-from-shell-variables var)))

 (use-package direnv :ensure t :defer t
--- a/lisp/icejam-custom-init.el
+++ b/lisp/icejam-custom-init.el
@ -23,42 +23,42 @@
 ;; (setopt max-lisp-eval-depth 10000)

 ;;; Use elpaca for package management.
-(defvar elpaca-installer-version 0.11)
+(defvar elpaca-installer-version 0.12)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
-(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
+(defvar elpaca-sources-directory (expand-file-name "sources/" elpaca-directory))
 (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
                              :ref nil :depth 1 :inherit ignore
                              :files (:defaults "elpaca-test.el" (:exclude "extensions"))
-                              :build (:not elpaca--activate-package)))
-(let* ((repo  (expand-file-name "elpaca/" elpaca-repos-directory))
+                              :build (:not elpaca-activate)))
+(let* ((repo  (expand-file-name "elpaca/" elpaca-sources-directory))
       (build (expand-file-name "elpaca/" elpaca-builds-directory))
       (order (cdr elpaca-order))
       (default-directory repo))
  (add-to-list 'load-path (if (file-exists-p build) build repo))
  (unless (file-exists-p repo)
    (make-directory repo t)
-    (when (< emacs-major-version 28) (require 'subr-x))
+    (when (<= emacs-major-version 28) (require 'subr-x))
    (condition-case-unless-debug err
-        (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
-                 ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
-                                                 ,@(when-let ((depth (plist-get order :depth)))
-                                                     (list (format "--depth=%d" depth) "--no-single-branch"))
-                                                 ,(plist-get order :repo) ,repo))))
-                 ((zerop (call-process "git" nil buffer t "checkout"
-                                       (or (plist-get order :ref) "--"))))
-                 (emacs (concat invocation-directory invocation-name))
-                 ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
-                                       "--eval" "(byte-recompile-directory \".\" 0 'force)")))
-                 ((require 'elpaca))
-                 ((elpaca-generate-autoloads "elpaca" repo)))
+        (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
+                  ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
+                                                  ,@(when-let* ((depth (plist-get order :depth)))
+                                                      (list (format "--depth=%d" depth) "--no-single-branch"))
+                                                  ,(plist-get order :repo) ,repo))))
+                  ((zerop (call-process "git" nil buffer t "checkout"
+                                        (or (plist-get order :ref) "--"))))
+                  (emacs (concat invocation-directory invocation-name))
+                  ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
+                                        "--eval" "(byte-recompile-directory \".\" 0 'force)")))
+                  ((require 'elpaca))
+                  ((elpaca-generate-autoloads "elpaca" repo)))
            (progn (message "%s" (buffer-string)) (kill-buffer buffer))
          (error "%s" (with-current-buffer buffer (buffer-string))))
      ((error) (warn "%s" err) (delete-directory repo 'recursive))))
  (unless (require 'elpaca-autoloads nil t)
    (require 'elpaca)
    (elpaca-generate-autoloads "elpaca" repo)
-    (load "./elpaca-autoloads")))
+    (let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
 (add-hook 'after-init-hook #'elpaca-process-queues)
 (elpaca `(,@elpaca-order))

--- a/lisp/icejam-eglot.el
+++ b/lisp/icejam-eglot.el
@ -3,7 +3,8 @@
 ;;; Global Language Server Protocol Config
 ;;; Code:

-(use-package eldoc-box :ensure t
+(use-package eldoc-box
+  :ensure (:host github :repo "casouri/eldoc-box" :ref "595262ec8ff56e8f86ef77d8e69339e84117e5f0")
  :hook ((emacs-lisp-mode . eldoc-box-hover-at-point-mode)
         (eglot--managed-mode . eldoc-box-hover-at-point-mode))
  :custom-face
--- a/lisp/icejam-transient.el
+++ b/lisp/icejam-transient.el
@ -41,10 +41,6 @@
    ("c" "Toggle Comment"     comment-line)
    ("r" "Replace"            vr/replace)
    ("i" "Indent"             indent-region)]]
-  [["Complete"
-    ("g" "Ask GPTel"             gptel-menu)
-    ("a" "Aider"                 aidermacs-transient-menu)
-    ("e" "Refactor with Elysium" elysium-query)]]
   [["Find"
    ("s" "Swiper"             consult-line)
    ("u" "Vundo"              vundo)