add dinference, agent-shell, update gptel bindingsHEADmaster

1 files changed, 34 insertions, 40 deletions

diff --git a/init.el b/init.el
index 7ac0532..d05fed3 100644
--- a/init.el
+++ b/init.el
@@ -113,18 +113,9 @@
   (setq aw-keys '(?a ?s ?d ?e ?f ?g ?h ?j ?k ?l))
   :bind ("C-x o" . 'ace-window))
 
-(use-package aider
+(use-package agent-shell
   :ensure t
-  :config
-  (setenv "OPENAI_API_BASE" "http://127.0.0.1:8080/v1")
-  (setenv "OPENAI_API_KEY" "dummy")
-
-  (setq aider-args
-        '("--model" "openai/mukel/Qwen2.5-Coder-7B-Instruct-GGUF"
-          "--no-auto-accept-architect"
-          "--no-auto-commits"))
-
-  (aider-magit-setup-transients))
+  :bind ("C-c a a" . 'agent-shell))
 
 (use-package apheleia
   :ensure t
@@ -146,10 +137,6 @@
 (use-package cargo-mode
   :ensure t)
 
-(use-package claude-code
-  :ensure t
-  :init)
-
 (use-package cmake-mode
   :ensure t
   :mode "\\CMakeLists\\.txt\\'")
@@ -266,15 +253,12 @@
 
 (use-package gptel
   :ensure t
-  :after (password-store aider claude-code)
+  :after (password-store)
   :bind (:prefix-map ai-commands
 		     :prefix-docstring "Emacs AI comamands"
-		     :prefix "C-c a"
-		     ("a" . 'gptel)
-                     ("r c" . 'claude-code-run)
-                     ("r o" . 'codex-cli-start)
-		     ("i" . 'aider-transient-menu)
-		     ("s" . 'gptel-menu)
+		     :prefix "C-c a g"
+		     ("b" . 'gptel)
+		     ("m" . 'gptel-menu)
 		     ("q" . 'gptel-abort)
 		     ("RET" . 'gptel-send)
                      ("ESC" . 'gptel-abort))
@@ -291,6 +275,12 @@
     :stream t
     :key (auth-source-pass-get 'secret "deepseek.com/api.deepseek.com/apikey"))
 
+  (gptel-make-openai "DInference"
+    :host "api.dinference.com"
+    :stream t
+    :key (auth-source-pass-get 'secret "dinference.com/api.dinference.com/apikey")
+    :models '(gpt-oss-120b gpt-oss-20b glm-5 glm-4.7))
+
   (gptel-make-gemini "gemini"
     :stream t
     :key (auth-source-pass-get 'secret "google.com/aiplatform.googleapis.com/gemini/apikey"))
@@ -357,12 +347,6 @@
   :init
   (marginalia-mode))
 
-(package-vc-install '(mevedel :url "https://github.com/FrauH0lle/mevedel"))
-(use-package mevedel
-  :after gptel
-  :config
-  (mevedel-install))
-
 (use-package multiple-cursors
   :ensure t
   :init
@@ -492,6 +476,15 @@
 (use-package nginx-mode
   :ensure t)
 
+(use-package ob-duckdb
+  :ensure t
+  :after org
+  :config
+  (org-babel-do-load-languages
+   'org-babel-load-languages
+   (append org-babel-load-languages
+           '((duckdb . t)))))
+
 (use-package ob-restclient
   :ensure t)
 
@@ -573,6 +566,19 @@
          (org-mode . org-indent-mode)
 	 (after-save . my/org-git-autocommit-after-save))
 
+  :preface
+  (defun my/org-agenda-workspace-files ()
+    "Return all plan.org files under ~/workspace, skipping common generated dirs."
+    (let ((root (expand-file-name "~/workspace")))
+      (seq-filter
+       (lambda (f)
+         (not (string-match-p
+               (rx "/" (or ".git" "node_modules" ".direnv" ".venv"
+                           "dist" "build" "target" ".cache")
+                   "/")
+               f)))
+       (directory-files-recursively root "\\`plan\\.org\\'"))))
+
   :init
   (org-babel-do-load-languages
    'org-babel-load-languages
@@ -598,18 +604,6 @@
 	(call-process "git" nil nil nil "add" "--" rel)
 	(call-process "git" nil nil nil "commit" "-m" msg "--" rel))))
 
-  (defun my/org-agenda-workspace-files ()
-    "Return all plan.org files under ~/workspace, skipping common generated dirs."
-    (let ((root (expand-file-name "~/workspace")))
-      (seq-filter
-       (lambda (f)
-         (not (string-match-p
-               (rx "/" (or ".git" "node_modules" ".direnv" ".venv"
-                           "dist" "build" "target" ".cache")
-                   "/")
-               f)))
-       (directory-files-recursively root "\\`plan\\.org\\'"))))
-
   :custom
   (org-html-htmlize-output-type 'css)