From 1e972e2c2ee8ed90f905baa2d1ed6ddb0e257bed Mon Sep 17 00:00:00 2001
From: SqrtMinusOne <thexcloud@gmail.com>
Date: Mon, 13 May 2024 22:54:14 +0300
Subject: [PATCH] emacs: fix agenda

---
 .emacs.d/init.el | 42 +++++++++++++++++++++++-------------------
 Emacs.org        | 44 +++++++++++++++++++++++++-------------------
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 2c47ba8..47e14a2 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -3557,10 +3557,13 @@ With ARG, repeats or can move backward if negative."
                                       (not (file-directory-p f))))))))
     (setq org-agenda-files
           (seq-filter #'file-exists-p
-                      `("inbox.org"
-                        "misc/habit.org"
-                        "contacts.org"
-                        ,@project-files)))
+                      (append
+                       project-files
+                       (mapcar (lambda (f)
+                                 (concat org-directory "/" f))
+                               '("inbox.org"
+                                 "misc/habit.org"
+                                 "contacts.org")))))
     (setq org-refile-targets
           `(,@(mapcar
                (lambda (f) `(,f . (:tag . "refile")))
@@ -4351,7 +4354,7 @@ KEYS is a list of cons cells like (<label> . <time>)."
   (let ((records (org-ql-query
                    :select #'element-with-markers
                    :from (current-buffer)
-                   :where `(and (ts :to ,(- days)) done))))
+                   :where `(and (ts :to ,(- days)) (done)))))
     (when (y-or-n-p (format "Archive %d records? " (length records)))
       (dolist (record records)
         (let ((marker (org-element-property :org-marker record)))
@@ -4817,7 +4820,7 @@ Review checklist:
 ")
 
       (insert (my/org-review-format-org-roam
-               (format-seconds "%Y-%m-%d" last-review-date)))
+               (format-time-string "%Y-%m-%d" (seconds-to-time last-review-date))))
       (insert "
 *** Summary
 TODO Write something, maybe? "))))
@@ -7832,23 +7835,25 @@ base toot."
     "i" #'gptel)
   :commands (gptel gptel-send gptel-menu)
   :config
-  (defun my/gptel-switch-backend (model)
-    (interactive (list (completing-read "Model: " my/gptel-backends)))
-    (setq gptel-model model)
-    (setq gptel-backend (alist-get model my/gptel-backends nil nil #'equal)))
+  (setq gptel-mode "llama3:latest")
+  (setq gptel-backend (gptel-make-ollama "Ollama"
+                        :host "localhost:11434"
+                        :stream t
+                        :models '("llama3:latest" "llama3-gradient"
+                                  "llama3:instruct")))
 
-  (setq my/gptel-backends
-        `(("llama3:latest" . ,(gptel-make-ollama "Ollama"
-                                :host "localhost:11434"
-                                :stream t
-                                :models '("llama3:latest" "llama3-gradient"
-                                          "llama3:instruct")))))
   (my/gptel-switch-backend "llama3:latest")
-
   (general-define-key
    :keymaps '(gptel-mode-map)
    :states '(insert normal)
-   "C-<return>" 'gptel-send))
+   "C-<return>" 'gptel-send)
+  (general-define-key
+   :keymaps '(gptel-mode-map)
+   :states '(normal)
+   "?" #'gptel-menu)
+  (gptel-make-gemini "Gemini"
+    :key (my/password-store-get-field "My_Online/Accounts/google-gemini" "api")
+    :stream t))
 
 (use-package ellama
   :straight t
@@ -7937,7 +7942,6 @@ base toot."
    ellama-provider
    (llm-make-chat-prompt
     (format prompt text))
-
    (lambda (changed-text)
      (when is-org-mode
        (setq changed-text (ellama--translate-markdown-to-org-filter changed-text)))
diff --git a/Emacs.org b/Emacs.org
index c70955a..38e197a 100644
--- a/Emacs.org
+++ b/Emacs.org
@@ -4987,10 +4987,13 @@ Also, my project structure is somewhat chaotic, so I have an =.el= file in the o
                                       (not (file-directory-p f))))))))
     (setq org-agenda-files
           (seq-filter #'file-exists-p
-                      `("inbox.org"
-                        "misc/habit.org"
-                        "contacts.org"
-                        ,@project-files)))
+                      (append
+                       project-files
+                       (mapcar (lambda (f)
+                                 (concat org-directory "/" f))
+                               '("inbox.org"
+                                 "misc/habit.org"
+                                 "contacts.org")))))
     (setq org-refile-targets
           `(,@(mapcar
                (lambda (f) `(,f . (:tag . "refile")))
@@ -5966,7 +5969,7 @@ And a function to archive all records older than the given number of days. I'll
   (let ((records (org-ql-query
                    :select #'element-with-markers
                    :from (current-buffer)
-                   :where `(and (ts :to ,(- days)) done))))
+                   :where `(and (ts :to ,(- days)) (done)))))
     (when (y-or-n-p (format "Archive %d records? " (length records)))
       (dolist (record records)
         (let ((marker (org-element-property :org-marker record)))
@@ -6622,7 +6625,7 @@ Review checklist:
 ")
 
       (insert (my/org-review-format-org-roam
-               (format-seconds "%Y-%m-%d" last-review-date)))
+               (format-time-string "%Y-%m-%d" (seconds-to-time last-review-date))))
       (insert "
 ,*** Summary
 TODO Write something, maybe? "))))
@@ -10756,6 +10759,7 @@ I don't have access to any proprietary APIs, but LLaMA 3 8b with [[https://ollam
 #+begin_src emacs-lisp
 (use-package gptel
   :straight t
+  :if (not my/is-termux)
   :init
   (my-leader-def
     :infix "ai"
@@ -10763,23 +10767,25 @@ I don't have access to any proprietary APIs, but LLaMA 3 8b with [[https://ollam
     "i" #'gptel)
   :commands (gptel gptel-send gptel-menu)
   :config
-  (defun my/gptel-switch-backend (model)
-    (interactive (list (completing-read "Model: " my/gptel-backends)))
-    (setq gptel-model model)
-    (setq gptel-backend (alist-get model my/gptel-backends nil nil #'equal)))
+  (setq gptel-mode "llama3:latest")
+  (setq gptel-backend (gptel-make-ollama "Ollama"
+                        :host "localhost:11434"
+                        :stream t
+                        :models '("llama3:latest" "llama3-gradient"
+                                  "llama3:instruct")))
 
-  (setq my/gptel-backends
-        `(("llama3:latest" . ,(gptel-make-ollama "Ollama"
-                                :host "localhost:11434"
-                                :stream t
-                                :models '("llama3:latest" "llama3-gradient"
-                                          "llama3:instruct")))))
   (my/gptel-switch-backend "llama3:latest")
-
   (general-define-key
    :keymaps '(gptel-mode-map)
    :states '(insert normal)
-   "C-<return>" 'gptel-send))
+   "C-<return>" 'gptel-send)
+  (general-define-key
+   :keymaps '(gptel-mode-map)
+   :states '(normal)
+   "?" #'gptel-menu)
+  (gptel-make-gemini "Gemini"
+    :key (my/password-store-get-field "My_Online/Accounts/google-gemini" "api")
+    :stream t))
 #+end_src
 
 *** ellama
@@ -10788,6 +10794,7 @@ I don't have access to any proprietary APIs, but LLaMA 3 8b with [[https://ollam
 #+begin_src emacs-lisp
 (use-package ellama
   :straight t
+  :if (not my/is-termux)
   :init
   (setq ellama-language "English")
   :config
@@ -10887,7 +10894,6 @@ And the function to do the prompting iself. Llama tends to output in Markdown, s
    ellama-provider
    (llm-make-chat-prompt
     (format prompt text))
-
    (lambda (changed-text)
      (when is-org-mode
        (setq changed-text (ellama--translate-markdown-to-org-filter changed-text)))