From 08553feafce6f280e0320eba7128dee5356893c9 Mon Sep 17 00:00:00 2001 From: Joshua Barrett Date: Fri, 12 Jun 2026 14:27:33 -0400 Subject: [PATCH] Remove ellama (for now) --- init.el | 52 ++++++------------------ lock/flake.lock | 105 +----------------------------------------------- lock/flake.nix | 37 ----------------- 3 files changed, 14 insertions(+), 180 deletions(-) diff --git a/init.el b/init.el index ac4ecf9..b22330a 100644 --- a/init.el +++ b/init.el @@ -684,45 +684,19 @@ current project." :ensure t :defer t) -(use-package ellama - :ensure t - :bind ("C-c e" . ellama-transient-main-menu) - ;; send last message in chat buffer with C-c C-c - :hook (org-ctrl-c-ctrl-c-final . ellama-chat-send-last-message) - :init (setopt ellama-auto-scroll t) - (setopt ellama-sessions-directory - (expand-file-name "ellama-transcripts" org-directory)) - :config - ;; show ellama context in header line in all buffers - (ellama-context-header-line-global-mode +1) - (require 'llm-ollama) - (setopt ellama-provider - (make-llm-ollama - :chat-model "gemma3:4b" - :embedding-model "nomic-embed-text" - :default-chat-non-standard-params '(("num_ctx" . 8192)))) - (setopt ellama-summarization-provider - (make-llm-ollama - :chat-model "gemma3:4b" - :embedding-model "nomic-embed-text" - :default-chat-non-standard-params '(("num_ctx" . 32768)))) - (setopt ellama-coding-provider - (make-llm-ollama - :chat-model "qwen2.5-coder:7b" - :embedding-model "nomic-embed-text" - :default-chat-non-standard-params '(("num_ctx" . 32768)))) - (setopt ellama-naming-provider - (make-llm-ollama - :chat-model "gemma3:4b" - :embedding-model "nomic-embed-text" - :default-chat-non-standard-params '(("stop" . ("\n"))))) - (setopt ellama-spinner-enabled nil) - - (setopt ellama-naming-scheme #'ellama-generate-name-by-llm) - (setopt ellama-providers - '(("deepseek" . (make-llm-ollama - :chat-model "deepseek-r1:7b" - :embedding-model "nomic-embed-text"))))) +;; (use-package ellama +;; :ensure t +;; :bind ("C-c e" . ellama) +;; ;; send last message in chat buffer with C-c C-c +;; :hook (org-ctrl-c-ctrl-c-hook . ellama-chat-send-last-message) +;; :init (setopt ellama-auto-scroll t) +;; (setopt ellama-sessions-directory +;; (expand-file-name "ellama-sessions" org-directory)) +;; :config +;; ;;TODO sort out later +;; ;; show ellama context in header line in all buffers +;; (setopt ellama-spinner-enabled nil) +;; (setopt ellama-naming-scheme #'ellama-generate-name-by-llm)) (use-package graphviz-dot-mode :ensure t diff --git a/lock/flake.lock b/lock/flake.lock index 02cd50c..9e463cc 100644 --- a/lock/flake.lock +++ b/lock/flake.lock @@ -432,22 +432,6 @@ "type": "github" } }, - "ellama": { - "flake": false, - "locked": { - "lastModified": 1779655696, - "narHash": "sha256-WjoTvGIHSrDwu+oszMX7aXLz4v2z9FL/NwP8HkFsc4E=", - "owner": "s-kostyaev", - "repo": "ellama", - "rev": "a6bc1e8eba6ba9f58198738cea1bcc8e43cbb628", - "type": "github" - }, - "original": { - "owner": "s-kostyaev", - "repo": "ellama", - "type": "github" - } - }, "embark": { "flake": false, "locked": { @@ -704,22 +688,6 @@ "type": "github" } }, - "llm": { - "flake": false, - "locked": { - "lastModified": 1779510843, - "narHash": "sha256-lTxbXzR5nGGmQfnagUNuH32GPtN2TOMzWGcLBvPEuH4=", - "owner": "ahyatt", - "repo": "llm", - "rev": "8bb1d42ab7e112a535a608c7a2538350f469e7b9", - "type": "github" - }, - "original": { - "owner": "ahyatt", - "repo": "llm", - "type": "github" - } - }, "magit": { "flake": false, "locked": { @@ -961,55 +929,6 @@ "type": "github" } }, - "plz": { - "flake": false, - "locked": { - "lastModified": 1723842760, - "narHash": "sha256-GRdYTm+7lslbfiMzT3xFKWiekQrYXWW8RXkuThDPL/Y=", - "owner": "alphapapa", - "repo": "plz.el", - "rev": "c579f039ffdb52ff61775ff25510a9c26e25d0c5", - "type": "github" - }, - "original": { - "owner": "alphapapa", - "ref": "stable", - "repo": "plz.el", - "type": "github" - } - }, - "plz-event-source": { - "flake": false, - "locked": { - "lastModified": 1744536667, - "narHash": "sha256-tK0/eXnOQe+IO853Q0Hf1Usu1OOPn2BoNWH7pee+A7o=", - "owner": "r0man", - "repo": "plz-event-source", - "rev": "de89214ce14e2b82cbfdc30e1adcf3e77b1f250a", - "type": "github" - }, - "original": { - "owner": "r0man", - "repo": "plz-event-source", - "type": "github" - } - }, - "plz-media-type": { - "flake": false, - "locked": { - "lastModified": 1744452044, - "narHash": "sha256-Ehcz6umf9pMNuUR9w/FE2Nodr0bPdule62rZWMEXLEw=", - "owner": "r0man", - "repo": "plz-media-type", - "rev": "b1127982d53affff082447030cda6e8ead3899cb", - "type": "github" - }, - "original": { - "owner": "r0man", - "repo": "plz-media-type", - "type": "github" - } - }, "promise": { "flake": false, "locked": { @@ -1087,7 +1006,6 @@ "elfeed": "elfeed", "elfeed-org": "elfeed-org", "elisp-refs": "elisp-refs", - "ellama": "ellama", "embark": "embark", "esxml": "esxml", "expand-region": "expand-region", @@ -1104,7 +1022,6 @@ "justl": "justl", "kind-icon": "kind-icon", "llama": "llama", - "llm": "llm", "magit": "magit", "magit-section": "magit-section", "majutsu": "majutsu", @@ -1120,9 +1037,6 @@ "org-noter": "org-noter", "org-setq": "org-setq", "pdf-tools": "pdf-tools", - "plz": "plz", - "plz-event-source": "plz-event-source", - "plz-media-type": "plz-media-type", "promise": "promise", "puni": "puni", "rg": "rg", @@ -1143,8 +1057,7 @@ "vundo": "vundo", "wgrep": "wgrep", "winum": "winum", - "with-editor": "with-editor", - "yaml": "yaml" + "with-editor": "with-editor" } }, "rust-mode": { @@ -1434,22 +1347,6 @@ "repo": "with-editor", "type": "github" } - }, - "yaml": { - "flake": false, - "locked": { - "lastModified": 1768287231, - "narHash": "sha256-q100u9hMSBiD7AdvueIZw+ZMEomMtS04GPOCbNaDZ7k=", - "owner": "zkry", - "repo": "yaml.el", - "rev": "f2369fb4985ed054be47ae111760ff2075dff72a", - "type": "github" - }, - "original": { - "owner": "zkry", - "repo": "yaml.el", - "type": "github" - } } }, "root": "root", diff --git a/lock/flake.nix b/lock/flake.nix index f9bfaa1..d3e7225 100644 --- a/lock/flake.nix +++ b/lock/flake.nix @@ -162,12 +162,6 @@ repo = "elisp-refs"; type = "github"; }; - ellama = { - flake = false; - owner = "s-kostyaev"; - repo = "ellama"; - type = "github"; - }; embark = { flake = false; owner = "oantolin"; @@ -264,12 +258,6 @@ repo = "llama"; type = "github"; }; - llm = { - flake = false; - owner = "ahyatt"; - repo = "llm"; - type = "github"; - }; magit = { flake = false; owner = "magit"; @@ -359,25 +347,6 @@ repo = "pdf-tools"; type = "github"; }; - plz = { - flake = false; - owner = "alphapapa"; - ref = "stable"; - repo = "plz.el"; - type = "github"; - }; - plz-event-source = { - flake = false; - owner = "r0man"; - repo = "plz-event-source"; - type = "github"; - }; - plz-media-type = { - flake = false; - owner = "r0man"; - repo = "plz-media-type"; - type = "github"; - }; promise = { flake = false; owner = "chuntaro"; @@ -501,12 +470,6 @@ repo = "with-editor"; type = "github"; }; - yaml = { - flake = false; - owner = "zkry"; - repo = "yaml.el"; - type = "github"; - }; }; outputs = { ... }: { }; } -- 2.51.2