From dc4ece08e28cac8d532c912ef19f145b08d0dab7 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 15 Aug 2025 12:52:34 -0500 Subject: [PATCH] fixes to emacs --- README.org | 17 ++++++++++++++--- init.el | 25 +++++++++++++++++-------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/README.org b/README.org index c79ab692..4e2ff220 100644 --- a/README.org +++ b/README.org @@ -857,7 +857,7 @@ Let's start by creating a self contained function of what I'd like started on ev (visual-fill-column-mode +1) (display-line-numbers-mode -1) (variable-pitch-mode +1) - (jinx-mode +1) + ;; (jinx-mode +1) (setq visual-fill-column-width 100 visual-fill-column-center-text t) @@ -2379,8 +2379,9 @@ Idk, let's try this i guess #+begin_src emacs-lisp (use-package aidermacs :config - (setenv "OLLAMA_API_BASE" "https://ai.tfcconnection.org") - (setq aidermacs-default-model "ollama_chat/llama3.2:latest" + (setenv "OPENAI_API_BASE" "https://ai.tfcconnection.org/v1") + (setenv "OPENAI_API_KEY" "yes") + (setq aidermacs-default-model "openai/gemma3:latest" aidermacs-backend 'comint aidermacs-watch-files t)) #+end_src @@ -2399,6 +2400,15 @@ Jinx is an enchanted spell checker for emacs. I think I'll just turn it on globa "C-S-f" 'jinx-correct)) #+end_src +#+begin_src emacs-lisp +(add-to-list 'eglot-server-programs + '(text-mode . ("harper-ls" "--stdio"))) +(add-to-list 'eglot-server-programs + '(org-mode . ("harper-ls" "--stdio"))) +(add-to-list 'eglot-server-programs + '((english-prose-mode :language-id "plaintext") . ("harper-ls" "--stdio"))) +#+end_src + ** Emoji In order to render color emojis I'll use =unicode-fonts=. #+begin_src emacs-lisp :tangle no @@ -3944,6 +3954,7 @@ Let's give eglot a try. (add-hook 'eglot-managed-mode-hook #'chris/eglot-capf) (add-to-list 'eglot-server-programs '(wgsl-mode "wgsl-analyzer")) + (add-to-list 'eglot-server-programs '(qml-mode "qmlls")) :general (general-def 'normal eglot-mode-map diff --git a/init.el b/init.el index 87992bc2..8582aef0 100644 --- a/init.el +++ b/init.el @@ -564,7 +564,7 @@ (visual-fill-column-mode +1) (display-line-numbers-mode -1) (variable-pitch-mode +1) - (jinx-mode +1) + ;; (jinx-mode +1) (setq visual-fill-column-width 100 visual-fill-column-center-text t) @@ -1728,11 +1728,11 @@ Optional BACKEND must be `re-reveal' or a backend derived from it." (use-package ox-hugo) -(use-package ox-zola - :load-path "ox-zola/" - :config - (setq org-hugo-base-dir "/home/chris/dev/cochrun.xyz" - org-hugo-section "blog")) +;; (use-package ox-zola +;; :load-path "ox-zola/" +;; :config +;; (setq org-hugo-base-dir "/home/chris/dev/cochrun.xyz" +;; org-hugo-section "blog")) (defun chris/window-delete-popup-frame (&rest _) "Kill selected selected frame if it has parameter `chris/window-popup-frame'. @@ -1787,8 +1787,9 @@ Describe everything that follows in the present tense, in response to what I typ (use-package aidermacs :config - (setenv "OLLAMA_API_BASE" "https://ai.tfcconnection.org") - (setq aidermacs-default-model "ollama_chat/llama3.2:latest" + (setenv "OPENAI_API_BASE" "https://ai.tfcconnection.org/v1") + (setenv "OPENAI_API_KEY" "yes") + (setq aidermacs-default-model "openai/gemma3:latest" aidermacs-backend 'comint aidermacs-watch-files t)) @@ -2874,6 +2875,13 @@ targets." (rust-ts-mode . eglot-ensure) :config + (add-to-list 'eglot-server-programs + '(text-mode . ("harper-ls" "--stdio"))) + (add-to-list 'eglot-server-programs + '(org-mode . ("harper-ls" "--stdio"))) + (add-to-list 'eglot-server-programs + '((english-prose-mode :language-id "plaintext") . ("harper-ls" "--stdio"))) + (setq eglot-autoshutdown t) (defun chris/eglot-capf () @@ -2885,6 +2893,7 @@ targets." (add-hook 'eglot-managed-mode-hook #'chris/eglot-capf) (add-to-list 'eglot-server-programs '(wgsl-mode "wgsl-analyzer")) + (add-to-list 'eglot-server-programs '(qml-mode "qmlls")) :general (general-def 'normal eglot-mode-map