From 53abe3289626cfc1d86746c2b67e8229ad5d6c4b Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Tue, 7 Oct 2025 09:25:22 -0500
Subject: [PATCH] better aider

---
 README.org | 17 +++++++++++------
 init.el    | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/README.org b/README.org
index 3e8c0b05..6f090a80 100644
--- a/README.org
+++ b/README.org
@@ -2315,7 +2315,7 @@ Describe everything that follows in the present tense, in response to what I typ
   (chris/leader-keys
     :states '(normal visual)
     :keymaps 'override
-    "la" 'gptel-send
+    "ls" 'gptel-send
     "lm" 'gptel-menu))
 #+end_src
 *** Ellama
@@ -2384,11 +2384,16 @@ Idk, let's try this i guess
 #+begin_src emacs-lisp
 (use-package aidermacs
   :config
-  (setenv "OPENAI_API_BASE" "https://ai.tfcconnection.org/v1")
-  (setenv "OPENAI_API_KEY" "yes")
-  (setq aidermacs-default-model "openai/gemma3:latest"
+  (setenv "OLLAMA_API_BASE" "https://ai.tfcconnection.org")
+  (setenv "OPENAI_API_KEY" "")
+  (setq aidermacs-default-model "ollama_chat/qwen3"
         aidermacs-backend 'comint
-        aidermacs-watch-files t))
+        aidermacs-watch-files t)
+  :general
+  (chris/leader-keys
+    :states 'normal
+    :keymaps 'override
+    "la" '(aidermacs-transient-menu :which-key "aidermacs")))
 #+end_src
 
 ** Jinx
@@ -3809,7 +3814,7 @@ I'd like to start learning and using rust if I can.
   (setq rustic-format-on-save t
         rustic-lsp-client 'eglot
         rustic-clippy-arguments "-- -W clippy::pedantic -W clippy::perf -W clippy::nursery -W clippy::unwrap_used"
-        rustic-rustfmt-args "--edition 2021"
+        rustic-rustfmt-args "--edition 2024"
         rust-format-on-save t
         rustic-cargo-clippy-trigger-fix t
         rustic-cargo-clippy-fix-args "--allow-dirty"
diff --git a/init.el b/init.el
index c90938f8..a80861b0 100644
--- a/init.el
+++ b/init.el
@@ -1783,16 +1783,21 @@ Describe everything that follows in the present tense, in response to what I typ
   (chris/leader-keys
     :states '(normal visual)
     :keymaps 'override
-    "la" 'gptel-send
+    "ls" 'gptel-send
     "lm" 'gptel-menu))
 
 (use-package aidermacs
   :config
-  (setenv "OPENAI_API_BASE" "https://ai.tfcconnection.org/v1")
-  (setenv "OPENAI_API_KEY" "yes")
-  (setq aidermacs-default-model "openai/gemma3:latest"
+  (setenv "OLLAMA_API_BASE" "https://ai.tfcconnection.org")
+  (setenv "OPENAI_API_KEY" "")
+  (setq aidermacs-default-model "ollama_chat/qwen3"
         aidermacs-backend 'comint
-        aidermacs-watch-files t))
+        aidermacs-watch-files t)
+  :general
+  (chris/leader-keys
+    :states 'normal
+    :keymaps 'override
+    "la" '(aidermacs-transient-menu :which-key "aidermacs")))
 
 (use-package jinx
   ;; :hook (emacs-startup . global-jinx-mode)
@@ -2807,7 +2812,7 @@ current buffer's, reload dir-locals."
   (setq rustic-format-on-save t
         rustic-lsp-client 'eglot
         rustic-clippy-arguments "-- -W clippy::pedantic -W clippy::perf -W clippy::nursery -W clippy::unwrap_used"
-        rustic-rustfmt-args "--edition 2021"
+        rustic-rustfmt-args "--edition 2024"
         rust-format-on-save t
         rustic-cargo-clippy-trigger-fix t
         rustic-cargo-clippy-fix-args "--allow-dirty"