From f635488ceef4d2f274987678a3d4db02fc51a3fb Mon Sep 17 00:00:00 2001
From: Levi Neely <141506390+lneely@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:38:39 +0200
Subject: [PATCH] merge

---
 .gitignore    |  1 +
 emacs/init.el | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index b13f6a1..a8f5d0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /emacs/straight/repos/
 /emacs/elisp
 /emacs/straight/
+/emacs/ellama-sessions/
diff --git a/emacs/init.el b/emacs/init.el
index 88e9b00..6f84de5 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -658,14 +658,21 @@
       (message "Copied file path: %s" filepath))))
 
 (global-set-key (kbd "C-x y b p") 'copy-file-path-to-clipboard)
-
 (add-hook 'before-save-hook #'gofmt-before-save)
 
 
-;; Ensure lsp-mode is installed
-(require 'package)
-(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
-(package-initialize)
-(unless (package-installed-p 'lsp-mode)
-  (package-refresh-contents)
-  (package-install 'lsp-mode))
+(use-package ellama
+  :init
+  ;; setup key bindings
+  (setopt ellama-keymap-prefix "C-c e")
+  ;; language you want ellama to translate to
+  (setopt ellama-language "English")
+  ;; could be llm-openai for example
+  (require 'llm-ollama)
+  (setopt 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 "codellama:latest"
+	   :embedding-model "nomic-embed-text"
+	   :default-chat-non-standard-params '(("num_ctx" . 8192)))))