emacs: Add new map, redo chatgpt

Add new applications mode map, testing it for replacement of general,
add archlinux.org/feed/news at elfeed. Use chatgpt just through
quelpa-use-package since it works fine now that I'm using Arch

1 files changed, 33 insertions, 177 deletions

diff --git a/org/emacs.org b/org/emacs.org
index 10189bc..2a3fa60 100755
--- a/org/emacs.org
+++ b/org/emacs.org
@@ -375,15 +375,6 @@ Hook with ~dired-mode~
     :config
     (setq multi-vterm-dedicated-window-height 25))
 #+end_src
-*** Keys
-#+begin_src emacs-lisp
-  (defvar thanos/vterm-map (make-sparse-keymap))
-  (define-prefix-command 'thanos/vterm-map)
-  (define-key global-map (kbd "C-c v") 'thanos/vterm-map)
-  (define-key thanos/vterm-map (kbd "n") 'multi-vterm-next)
-  (define-key thanos/vterm-map (kbd "p") 'multi-vterm-prev)
-  (define-key thanos/vterm-map (kbd "d") 'multi-vterm-dedicated-open)
-#+end_src
 ** Eshell
 #+begin_src emacs-lisp
   (use-package eshell
@@ -415,173 +406,6 @@ Hook with ~dired-mode~
   ;; (setq eshell-highlight-prompt t)  
 #+end_src
 * Custom
-** ChatGPT
-#+begin_src emacs-lisp
-  (require 'seq)
-  (eval-when-compile
-    (require 'cl-lib)
-    (require 'subr-x)
-    (require 'env)
-    (require 'json))
-  (defgroup chatgpt nil
-    "ChatGPT frontend."
-    :group 'convenience
-    :prefix "chatgpt-")
-  (defcustom chatgpt-max-tokens 300
-    "Upper limit on the number of tokens the API will return."
-    :type 'integer)
-  (defvar chatgpt-buffer "*ChatGPT*"
-    "Title of the buffer used to store the results of an OpenAI API query.")
-  (define-error 'chatgpt-error "An error related to the ChatGPT emacs package")
-  (define-error 'chatgpt-parsing-error
-    "An error caused by a failure to parse an OpenAI API Response")
-  (defmacro chatgpt-show-results-buffer-if-active ()
-    "Show the results in other window if necessary."
-    `(if (and (not ;; visible
-	       (get-buffer-window chatgpt-buffer))
-	      (called-interactively-p 'interactive))
-	 (lambda (&optional buf) (ignore buf)
-	   (with-current-buffer buf
-	     (view-mode t))
-	   (switch-to-buffer-other-window chatgpt-buffer))
-       #'identity))
-  ;;;###autoload
-  (defun chatgpt-prompt (prompt callback)
-    "Query OpenAI with PROMPT calling the CALLBACK function on the resulting buffer.
-  Returns buffer containing the text from this query"
-    (interactive (list (read-string "Prompt ChatGPT with: ")
-		       (lambda (buf) (with-current-buffer buf
-				  (view-mode t))
-			 (switch-to-buffer-other-window chatgpt-buffer))))
-    (chatgpt--query-open-api prompt
-			     (lambda (results)
-			       (with-current-buffer (get-buffer-create chatgpt-buffer)
-				 ;; Erase contents of buffer after receiving response
-				 (read-only-mode -1)
-				 (erase-buffer)
-				 (insert results)
-				 ;; Return the chatgpt output buffer for non interactive usage
-				 (funcall callback (current-buffer))))))
-  ;;;###autoload
-  (defun chatgpt-fix-region (BEG END)
-    "Takes a region BEG to END asks ChatGPT to explain whats wrong with it.
-  It then displays the answer in the `chatgpt-buffer'."
-    (interactive "r")
-    (let ((current-code (buffer-substring BEG END)))
-      (chatgpt-prompt (chatgpt--append-to-prompt
-		       current-code
-		       "Why doesn't this code work?")
-		      (chatgpt-show-results-buffer-if-active))))
-  ;;;###autoload
-  (defun chatgpt-explain-region (BEG END)
-    "Takes a region BEG to END asks ChatGPT what it does.
-  The answer in the displays in `chatgpt-buffer'."
-    (interactive "r")
-    (let ((current-code (buffer-substring BEG END)))
-      (chatgpt-prompt (chatgpt--append-to-prompt
-		       current-code
-		       "What does this code do?")
-		      (chatgpt-show-results-buffer-if-active))))
-  ;;;###autoload
-  (defun chatgpt-gen-tests-for-region (BEG END)
-    "Takes a region BEG to END asks ChatGPT to write a test for it.
-  It then displays the answer in the `chatgpt-buffer'."
-    (interactive "r")
-    (let ((current-code (buffer-substring BEG END)))
-      (chatgpt-prompt (chatgpt--append-to-prompt
-		       current-code
-		       "Write me a tests for this code")
-		      (chatgpt-show-results-buffer-if-active))))
-  ;; TODO currently just says what changed but doesn't wanna show the code it's self
-  ;; (defun chatgpt-optimize-region (BEG END)
-  ;;   "Takes a region BEG to END asks ChatGPT to optimize it for speed.
-  ;; It then displays the answer in the `chatgpt-buffer'."
-  ;;   (interactive "r")
-  ;;   (let ((current-code         (buffer-substring BEG END)))
-  ;;     (chatgpt-prompt (chatgpt--append-to-prompt
-  ;;                      current-code
-  ;;                      "Refactor this code for speed and tell me what you changed and why it's faster")
-  ;;                     (chatgpt-show-results-buffer-if-active))))
-  ;;;###autoload
-  (defun chatgpt-refactor-region (BEG END)
-    "Takes a region BEG to END asks ChatGPT refactor it.
-  It then displays the answer in the `chatgpt-buffer'."
-    (interactive "r")
-    (let ((current-code         (buffer-substring BEG END)))
-      (chatgpt-prompt (chatgpt--append-to-prompt
-		       current-code
-		       "Refactor this code and tell me what you changed")
-		      (chatgpt-show-results-buffer-if-active))))
-  ;;;###autoload
-  (defun chatgpt-prompt-region (BEG END)
-    "Prompt ChatGPT with the region BEG END.
-  It then displays the results in a separate buffer `chatgpt-buffer'."
-    (interactive "r")
-    (chatgpt-prompt (buffer-substring BEG END)
-		    ;; Show the results if not already being viewed
-		    (chatgpt-show-results-buffer-if-active)))
-  ;;;###autoload
-  (defun chatgpt-prompt-region-and-replace (BEG END)
-    "Replace region from BEG to END with the response from the ChatGPT API.
-  The region is BEG and until END"
-    (interactive "r")
-    (let ((og-buf (current-buffer)))
-      (chatgpt-prompt (buffer-substring BEG END)
-		      (lambda (buf)
-			(save-excursion
-			  (with-current-buffer og-buf
-			    (delete-region BEG END)
-			    (goto-char BEG)
-			    (insert (with-current-buffer buf (buffer-string)))))))))
-  (defun chatgpt--append-to-prompt (prompt comment-str)
-    "Append the string COMMENT-STR extra information to a PROMPT as a comment."
-    (concat prompt
-	    "\n"
-	    comment-start
-	    " "
-	    comment-str))
-  (defun chatgpt--extract-text-from-query (query-result)
-    "Extract the resulting text from a given OpenAI response QUERY-RESULT."
-    (condition-case err
-	(thread-last query-result
-		     (assoc-default 'choices)
-		     seq-first
-		     (assoc-default 'text)
-		     string-trim)
-      (error
-       (signal 'chatgpt-parsing-error err))))
-  (defun chatgpt--parse-response (status callback)
-    "Ignoring STATUS and parse the response executing the CALLBACK function on the resulting string."
-    (ignore status)
-    ;; All this is ran inside the buffer containing the response
-    (goto-char 0)
-    (re-search-forward "^$")
-    (funcall callback (chatgpt--extract-text-from-query (json-read))))
-  (defun chatgpt--query-open-api (prompt callback)
-    "Send a string PROMPT to OpenAI API and pass the resulting buffer to CALLBACK.
-  The environment variable OPENAI_API_KEY is used as your API key
-  You can register an account here
-  https://beta.openai.com/docs/introduction/key-concepts"
-    (let* ((api-key sercret-api)
-	   (url-request-method (encode-coding-string "POST" 'us-ascii))
-	   (url-request-extra-headers `(("Content-Type" . "application/json")
-					("Authorization" . ,(format "Bearer %s" api-key))))
-	   (url-request-data (json-encode
-			      `(("model" . "text-davinci-003")
-				("prompt" . ,prompt)
-				("max_tokens" . ,chatgpt-max-tokens)
-				("temperature" . 0)))))
-      (cl-assert (not (string= "" api-key))
-		 t
-		 "Current contents of the environmental variable OPENAI_API_KEY
-  are '%s' which is not an appropriate OpenAI token please ensure
-  you have the correctly set the OPENAI_API_KEY variable"
-		 api-key)
-      (url-retrieve
-       "https://api.openai.com/v1/completions"
-       'chatgpt--parse-response
-       (list callback))))
-#+end_src
 ** Random functions
 #+begin_src emacs-lisp
   (defun apollo/html-boostrap-boilerplate ()
@@ -695,9 +519,28 @@ Hook with ~dired-mode~
   (global-set-key (kbd "<escape>") 'keyboard-escape-quit)
   (global-set-key (kbd "s-=") 'text-scale-increase)
   (global-set-key (kbd "s--") 'text-scale-decrease)
+  (global-set-key (kbd "C-k") 'copy-region-as-kill)
   ;; Pass
   (global-set-key (kbd "C-c p i") 'password-store-insert)
   (global-set-key (kbd "C-c p e") 'password-store-edit)
+
+
+
+  (define-prefix-command 'thanos/applications-map)
+  (define-key thanos/applications-map (kbd "q") 'chatgpt-query)
+  (define-key thanos/applications-map (kbd "a") 'mu4e)
+  (define-key thanos/applications-map (kbd "t") 'counsel-load-theme)
+  (define-key thanos/applications-map (kbd "f") 'elfeed)
+  (global-set-key (kbd "C-c a") 'thanos/applications-map)
+
+
+  (defvar thanos/vterm-map (make-sparse-keymap))
+  (define-prefix-command 'thanos/vterm-map)
+  (define-key global-map (kbd "C-c v") 'thanos/vterm-map)
+  (define-key thanos/vterm-map (kbd "n") 'multi-vterm-next)
+  (define-key thanos/vterm-map (kbd "p") 'multi-vterm-prev)
+  (define-key thanos/vterm-map (kbd "d") 'multi-vterm-dedicated-open)
+  (define-key thanos/vterm-map (kbd "o") 'multi-vterm)
 #+end_src
 *** General
 #+begin_src emacs-lisp
@@ -756,6 +599,17 @@ Hook with ~dired-mode~
     :keymaps 'org-mode-map
     "3" 'org-insert-image-size-300)  
 #+end_src
+** ChatGPT
+#+begin_src emacs-lisp
+  (require 'quelpa-use-package)
+  (use-package chatgpt
+    :quelpa ((chatgpt :fetcher git :url "https://github.com/joshcho/ChatGPT.el.git") :upgrade t)
+    :init
+    (require 'python)
+    (setq chatgpt-repo-path (expand-file-name "chatgpt/" quelpa-build-dir))
+    (setq python-interpreter "/usr/bin/python3")
+    :bind ("C-c q" . chatgpt-query))
+#+end_src
 * Org-mode Configuration
 ** org-make-toc
 #+begin_src emacs-lisp
@@ -1094,7 +948,9 @@ Hook with ~dired-mode~
 		       ("https://www.youtube.com/feeds/videos.xml?channel_id=UCq6VFHwMzcMXbuKyG7SQYIg"
 			video moist)
 		       ("https://www.youtube.com/feeds/videos.xml?channel_id=UC05XpvbHZUQOfA6xk4dlmcw"
-			video djware))))
+			video djware)
+		       ("https://archlinux.org/feeds/news/"
+			ArchLinux Latest))))
 
 #+end_src
 ** Settings & Keys