codex: properly prefix functions

init.el

@@ -99,7 +99,6 @@
 (keymap-global-set "M-i"     #'imenu)
 (keymap-global-set "<f5>"    #'compile)
 (keymap-global-set "C-c r r" #'revert-buffer)
-(keymap-global-set "C-c C-c" #'comment-or-uncomment-region)
 (keymap-global-set "M-]"     #'forward-paragraph)
 (keymap-global-set "M-["     #'backward-paragraph)
 (keymap-global-set "C-h h"   #'eldoc)
@@ -147,7 +146,7 @@
   :defer t)
 
 (use-package haskell-mode
-  :defer t)
+  :mode "\\.hs\\'")
 
 (use-package company)
 
@@ -157,16 +156,16 @@
            (not (s-contains? "sbcl" buf))
            (not (s-contains? "ocicl" buf))
            (not (string-prefix-p "*sly" buf)))
-      (parinfer-rust-mode 1)
-      (electric-quote-mode 1))))
+      (parinfer-rust-mode 1))))
 
 (use-package parinfer-rust-mode
+  :defer t
   :hook ((lisp-mode emacs-lisp-mode) . enable-parinfer)
   :config
   (setq parinfer-rust-disable-troublesome-modes t))
 
 (use-package sly
-  :defer t
+  :mode "\\.lisp\\'"
   :custom
   (inferior-lisp-program "/opt/homebrew/bin/sbcl"))
 
@@ -310,7 +309,7 @@
   :after (yasnippet))
 
 (use-package markdown-mode
-  :ensure t)
+  :mode "\\.md\\'")
 
 ;; Run Prettier only in certain major-modes before saving:
 (defvar hgh/prettier-modes
@@ -318,7 +317,7 @@
   "List of major modes where Prettier should auto-run on save.")
 
 (defun hgh/run-prettier-if-appropriate ()
-  "Run Prettier on the buffer’s file if `major-mode` is in `my/prettier-modes`."
+  "Run Prettier on the buffer's file if `major-mode` is in `my/prettier-modes`."
   (when (and (buffer-file-name)
              (member major-mode hgh/prettier-modes))
     ;; call the prettier CLI; output errors to *Prettier Errors* buffer
@@ -329,13 +328,14 @@
 
 (add-hook 'after-save-hook #'hgh/run-prettier-if-appropriate)
 
-(use-package terraform-mode)
+(use-package terraform-mode
+  :mode ("\\.tf\\'" "\\.tfvars\\'"))
 
 (use-package cider
   :defer t)
 
 (use-package org
-  :defer t
+  :mode "\\.org\\'"
   :custom
   (org-todo-keywords '((sequence "TODO" "INPROGRESS" "DONE")))
   (org-support-shift-select t)
@@ -370,24 +370,33 @@
   :init
   (add-hook 'xref-backend-functions #'dumber-jump-xref-activate))
 
-(use-package flycheck)
-  ; :init (global-flycheck-mode)
-
-
 (use-package idris-mode)
 
 (use-package htmlize)
 
-(use-package zig-mode)
+(use-package zig-mode
+  :mode "\\.zig\\'")
 
-(use-package fsharp-mode)
+(use-package fsharp-mode
+  :mode "\\.fs\\'")
 
-(use-package caddyfile-mode)
+(use-package caddyfile-mode
+  :defer t)
 
-(use-package dockerfile-mode)
+(use-package dockerfile-mode
+  :defer t)
 
 (use-package odin-mode
+  :mode "\\.odin\\'"
   :ensure nil)
 
+(use-package emacs-lisp-mode
+  :ensure nil
+  :bind (:map emacs-lisp-mode-map ("C-c C-c" . eval-defun)))
+
 (use-package codex
+  :commands codex
+  :custom
+  (codex-provider nil)
+  (codex-model nil)
   :ensure nil)

local-lisp/codex.el

@@ -149,8 +149,8 @@ http_headers = {
            (insert-file-contents history-file)
            (goto-char (point-max))
            (unless (codex--set-prompt-start-from-buffer)
-             (user-prompt)))
-       (user-prompt)))))
+             (codex--user-prompt)))
+       (codex--user-prompt)))))
 
 (defun list->hash-set (list &optional test)
   "Return a hash table whose keys are the elements of LIST."
@@ -162,13 +162,13 @@ http_headers = {
   `(with-current-buffer (get-buffer-create codex-buffer-name)
      ,@body))
 
-(defun prompt-delimiter ()
+(defun codex--prompt-delimiter ()
   (newline)
   (insert "---")
   (newline))
 
-(defun user-prompt ()
-  (prompt-delimiter)
+(defun codex--user-prompt ()
+  (codex--prompt-delimiter)
   (insert "User:")
   (newline)
   (setq codex--prompt-start (point-marker)))
@@ -179,7 +179,7 @@ http_headers = {
    (insert "Codex:")
    (newline)
    (insert msg)
-   (user-prompt)
+   (codex--user-prompt)
    (codex--save-session-history)))
 
 (defun codex--parse-session-id (jsons)
@@ -219,12 +219,6 @@ http_headers = {
     (unless (member codex--session-id (mapcar #'cdr sessions))
       (codex--write-sessions-file (cons (cons prompt codex--session-id) sessions)))))
 
-(defun codex--format-response (msg)
-  (with-temp-buffer
-    (insert msg)
-    (fill-region (point-min) (point-max))
-    (buffer-string)))
-
 (defun codex--send (prompt)
   "Sends a prompt to codex."
   (let* ((buf (generate-new-buffer "*codex--send*"))
@@ -250,7 +244,6 @@ http_headers = {
            (thread-first
              (buffer-string)
              codex--parse-msg-from-response
-             codex--format-response
              codex--write-to-chat)
            (codex--ensure-session-in-sessions-file prompt)
            (kill-buffer)))