sqrtminusone/dotfiles
1
0
Fork 0
mirror of https://github.com/SqrtMinusOne/dotfiles.git synced 2025-12-11 19:45:25 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: fix agenda

Browse source
This commit is contained in:
Pavel Korytov 2024-05-13 22:54:14 +03:00
parent 444158e14b
commit 1e972e2c2e
2 changed files with 48 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
.emacs.d/init.el
View file

@ -3557,10 +3557,13 @@ With ARG, repeats or can move backward if negative."
(not (file-directory-p f)))))))) (not (file-directory-p f))))))))
(setq org-agenda-files (setq org-agenda-files
(seq-filter #'file-exists-p (seq-filter #'file-exists-p
`("inbox.org" (append
"misc/habit.org" project-files
"contacts.org" (mapcar (lambda (f)
,@project-files))) (concat org-directory "/" f))
'("inbox.org"
"misc/habit.org"
"contacts.org")))))
(setq org-refile-targets (setq org-refile-targets
`(,@(mapcar `(,@(mapcar
(lambda (f) `(,f . (:tag . "refile"))) (lambda (f) `(,f . (:tag . "refile")))
@ -4351,7 +4354,7 @@ KEYS is a list of cons cells like (<label> . <time>)."
(let ((records (org-ql-query (let ((records (org-ql-query
:select #'element-with-markers :select #'element-with-markers
:from (current-buffer) :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))) (when (y-or-n-p (format "Archive %d records? " (length records)))
(dolist (record records) (dolist (record records)
(let ((marker (org-element-property :org-marker record))) (let ((marker (org-element-property :org-marker record)))
@ -4817,7 +4820,7 @@ Review checklist:
") ")
(insert (my/org-review-format-org-roam (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 " (insert "
*** Summary *** Summary
TODO Write something, maybe? ")))) TODO Write something, maybe? "))))
@ -7832,23 +7835,25 @@ base toot."
"i" #'gptel) "i" #'gptel)
:commands (gptel gptel-send gptel-menu) :commands (gptel gptel-send gptel-menu)
:config :config
(defun my/gptel-switch-backend (model) (setq gptel-mode "llama3:latest")
(interactive (list (completing-read "Model: " my/gptel-backends))) (setq gptel-backend (gptel-make-ollama "Ollama"
(setq gptel-model model) :host "localhost:11434"
(setq gptel-backend (alist-get model my/gptel-backends nil nil #'equal))) :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") (my/gptel-switch-backend "llama3:latest")
(general-define-key (general-define-key
:keymaps '(gptel-mode-map) :keymaps '(gptel-mode-map)
:states '(insert normal) :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 (use-package ellama
:straight t :straight t
@ -7937,7 +7942,6 @@ base toot."
ellama-provider ellama-provider
(llm-make-chat-prompt (llm-make-chat-prompt
(format prompt text)) (format prompt text))
(lambda (changed-text) (lambda (changed-text)
(when is-org-mode (when is-org-mode
(setq changed-text (ellama--translate-markdown-to-org-filter changed-text))) (setq changed-text (ellama--translate-markdown-to-org-filter changed-text)))

44
Emacs.org
View file

@ -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)))))))) (not (file-directory-p f))))))))
(setq org-agenda-files (setq org-agenda-files
(seq-filter #'file-exists-p (seq-filter #'file-exists-p
`("inbox.org" (append
"misc/habit.org" project-files
"contacts.org" (mapcar (lambda (f)
,@project-files))) (concat org-directory "/" f))
'("inbox.org"
"misc/habit.org"
"contacts.org")))))
(setq org-refile-targets (setq org-refile-targets
`(,@(mapcar `(,@(mapcar
(lambda (f) `(,f . (:tag . "refile"))) (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 (let ((records (org-ql-query
:select #'element-with-markers :select #'element-with-markers
:from (current-buffer) :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))) (when (y-or-n-p (format "Archive %d records? " (length records)))
(dolist (record records) (dolist (record records)
(let ((marker (org-element-property :org-marker record))) (let ((marker (org-element-property :org-marker record)))
@ -6622,7 +6625,7 @@ Review checklist:
") ")
(insert (my/org-review-format-org-roam (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 " (insert "
,*** Summary ,*** Summary
TODO Write something, maybe? ")))) 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 #+begin_src emacs-lisp
(use-package gptel (use-package gptel
:straight t :straight t
:if (not my/is-termux)
:init :init
(my-leader-def (my-leader-def
:infix "ai" :infix "ai"
@ -10763,23 +10767,25 @@ I don't have access to any proprietary APIs, but LLaMA 3 8b with [[https://ollam
"i" #'gptel) "i" #'gptel)
:commands (gptel gptel-send gptel-menu) :commands (gptel gptel-send gptel-menu)
:config :config
(defun my/gptel-switch-backend (model) (setq gptel-mode "llama3:latest")
(interactive (list (completing-read "Model: " my/gptel-backends))) (setq gptel-backend (gptel-make-ollama "Ollama"
(setq gptel-model model) :host "localhost:11434"
(setq gptel-backend (alist-get model my/gptel-backends nil nil #'equal))) :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") (my/gptel-switch-backend "llama3:latest")
(general-define-key (general-define-key
:keymaps '(gptel-mode-map) :keymaps '(gptel-mode-map)
:states '(insert normal) :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 #+end_src
*** ellama *** 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 #+begin_src emacs-lisp
(use-package ellama (use-package ellama
:straight t :straight t
:if (not my/is-termux)
:init :init
(setq ellama-language "English") (setq ellama-language "English")
:config :config
@ -10887,7 +10894,6 @@ And the function to do the prompting iself. Llama tends to output in Markdown, s
ellama-provider ellama-provider
(llm-make-chat-prompt (llm-make-chat-prompt
(format prompt text)) (format prompt text))
(lambda (changed-text) (lambda (changed-text)
(when is-org-mode (when is-org-mode
(setq changed-text (ellama--translate-markdown-to-org-filter changed-text))) (setq changed-text (ellama--translate-markdown-to-org-filter changed-text)))