From 2238ef7ca9a827e9870509b161d0624ae4897b65 Mon Sep 17 00:00:00 2001
From: Jacopo De Simoi <wilderkde@gmail.com>
Date: Fri, 10 Apr 2026 10:25:00 -0400
Subject: [PATCH] Ellama stuff

---
 global.org | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/global.org b/global.org
index 9afc1b8..19a2e78 100644
--- a/global.org
+++ b/global.org
@@ -3612,6 +3612,32 @@
      (add-hook 'nov-mode-hook
                     #'(lambda () (setq-local show-trailing-whitespace nil)))
 
+   #+end_src
+** ediff
+   #+begin_src emacs-lisp
+     (setq ediff-window-setup-function 'ediff-setup-windows-plain)
+     (defvar my-ediff-last-windows nil)
+     (defun my-store-pre-ediff-winconfig ()
+       (setq my-ediff-last-windows (current-window-configuration)))
+
+     (defun my-restore-pre-ediff-winconfig ()
+       (set-window-configuration my-ediff-last-windows))
+
+     (add-hook 'ediff-before-setup-hook #'my-store-pre-ediff-winconfig)
+     (add-hook 'ediff-quit-hook #'my-restore-pre-ediff-winconfig)
+
+   #+end_src
+** Ellama
+   Set default provider to be mistral (for now eh)
+   #+begin_src emacs-lisp
+     (setq ellama-provider
+           (make-llm-ollama
+       	   ;; this model should be pulled to use it
+       	   ;; value should be the same as you print in terminal during pull
+       	   :chat-model "llama3"
+       	   :embedding-model "nomic-embed-text"
+       	   :default-chat-non-standard-params '(("num_ctx" . 8192))))
+
    #+end_src
 ** TODO Phase out Package.el
    Load package.el