refactor(emacs): combine orgconfig.el and priime-org.el
Signed-off-by: Lucas Sta Maria <lucas@priime.dev>
This commit is contained in:
parent
9b862b7d2b
commit
515953242d
3 changed files with 149 additions and 193 deletions
|
|
@ -1,189 +0,0 @@
|
||||||
;;; orgconfig.el --- Configuration for org-mode.
|
|
||||||
;;; Commentary:
|
|
||||||
;; Configuration for org-mode.
|
|
||||||
;;; Code:
|
|
||||||
|
|
||||||
(require 'org)
|
|
||||||
(require 'org-roam)
|
|
||||||
(require 'org-capture)
|
|
||||||
(require 'org-id)
|
|
||||||
;; Templates for org-mode
|
|
||||||
(require 'org-tempo)
|
|
||||||
(require 's)
|
|
||||||
|
|
||||||
;; Multiple Org Workspaces
|
|
||||||
(defvar org-workspaces-alist
|
|
||||||
'(("docs" . ("~/org/docs/" . "~/.emacs.d/org-roam.db"))))
|
|
||||||
|
|
||||||
(defun org-switch-workspace (&optional workspace-name)
|
|
||||||
"Switch the current org-roam-directory to WORKSPACE-NAME."
|
|
||||||
(interactive)
|
|
||||||
(defconst default-workspace-name (caar org-workspaces-alist))
|
|
||||||
(defconst prompt-message (format "Org Roam Workspace (default \"%s\"): "
|
|
||||||
default-workspace-name))
|
|
||||||
(let ((workspace-name
|
|
||||||
(or workspace-name
|
|
||||||
(completing-read prompt-message
|
|
||||||
org-workspaces-alist
|
|
||||||
nil t nil nil
|
|
||||||
default-workspace-name))))
|
|
||||||
(setq org-roam-directory (cadr (assoc workspace-name org-workspaces-alist)))
|
|
||||||
(setq org-roam-db-location (cddr (assoc workspace-name org-workspaces-alist)))
|
|
||||||
(org-roam-db-sync nil)))
|
|
||||||
|
|
||||||
;; Settings
|
|
||||||
(setq org-hide-emphasis-markers t)
|
|
||||||
(setq org-adapt-indentation nil)
|
|
||||||
(setq org-confirm-babel-evaluate nil)
|
|
||||||
(setq org-export-use-babel nil)
|
|
||||||
(setq org-agenda-include-diary t)
|
|
||||||
(setq org-src-preserve-indentation t)
|
|
||||||
(setq org-roam-directory "~/org/docs/")
|
|
||||||
(setq org-roam-extract-new-file-path "${slug}.org")
|
|
||||||
(setq org-roam-node-display-template
|
|
||||||
(concat "${title} "
|
|
||||||
"(${id:8}) "
|
|
||||||
(propertize "[${tags}]" 'face 'org-tag)))
|
|
||||||
(setq org-link-frame-setup
|
|
||||||
'((vm . vm-visit-folder-other-frame)
|
|
||||||
(vm-imap . vm-visit-imap-folder-other-frame)
|
|
||||||
(gnus . org-gnus-no-new-news)
|
|
||||||
(file . find-file)
|
|
||||||
(wl . wl-other-frame)))
|
|
||||||
|
|
||||||
|
|
||||||
(org-roam-db-autosync-mode)
|
|
||||||
|
|
||||||
;; Enable Racket in Org-mode Babel
|
|
||||||
(org-babel-do-load-languages
|
|
||||||
'org-babel-load-languages
|
|
||||||
'((racket . t)
|
|
||||||
(python . t)
|
|
||||||
(java . t)))
|
|
||||||
|
|
||||||
(setq org-babel-default-header-args:racket
|
|
||||||
'((:session . "none")
|
|
||||||
(:results . "output")))
|
|
||||||
|
|
||||||
(defun org-roam-migrate ()
|
|
||||||
"Migrate a regular org file into an org-roam file in my format."
|
|
||||||
(interactive)
|
|
||||||
(unless (eq major-mode 'dired-mode)
|
|
||||||
(error "BAD!"))
|
|
||||||
(dired-find-file)
|
|
||||||
(let* ((id (org-id-get-create))
|
|
||||||
(_ (save-buffer))
|
|
||||||
(new-format "%s-%s.org")
|
|
||||||
(filename-old (buffer-file-name (current-buffer)))
|
|
||||||
(filename-min (file-name-sans-extension filename-old))
|
|
||||||
(filename-new (format new-format filename-min id)))
|
|
||||||
(rename-file filename-old filename-new)
|
|
||||||
(kill-buffer (current-buffer))
|
|
||||||
(revert-buffer)))
|
|
||||||
|
|
||||||
(setcar (nthcdr 4 org-emphasis-regexp-components) 20)
|
|
||||||
(org-set-emph-re 'org-emphasis-regexp-components org-emphasis-regexp-components)
|
|
||||||
(setq org-agenda-files '("~/org/gtd.org"))
|
|
||||||
(setq org-capture-templates '(("t" "Todo [inbox]" entry
|
|
||||||
(file+headline "~/org/gtd.org" "GTD")
|
|
||||||
"* TODO %i%?")))
|
|
||||||
(setq org-roam-capture-templates
|
|
||||||
'(("n" "default" plain "%?"
|
|
||||||
:target (file+head "${slug}-${id}.org" "#+title: ${title}\n")
|
|
||||||
:unnarrowed t)
|
|
||||||
("N" "encrypted" plain "%?"
|
|
||||||
:target (file+head "${slug}-${id}.org.gpg" "#+title: ${title}\n")
|
|
||||||
:unnarrowed t)))
|
|
||||||
(setq org-refile-targets '(("~/org/gtd.org" :maxlevel . 3)
|
|
||||||
("~/org/someday.org" :level . 1)
|
|
||||||
("~/org/tickler.org" :maxlevel . 2)))
|
|
||||||
(setq org-todo-keywords '((sequence "TODO(t)" "WAITING(w)" "|" "DONE(d)" "CANCELLED(c)")))
|
|
||||||
|
|
||||||
(defmacro η (fnc)
|
|
||||||
"Return function that ignores its arguments and invokes FNC."
|
|
||||||
`(lambda (&rest _rest)
|
|
||||||
(funcall ,fnc)))
|
|
||||||
|
|
||||||
;; Keybinds
|
|
||||||
(defvar-keymap org-roam-keymap
|
|
||||||
"n" #'org-roam-capture
|
|
||||||
"f" #'org-roam-node-find
|
|
||||||
"i" #'org-roam-node-insert
|
|
||||||
"t" #'org-roam-tag-add
|
|
||||||
"s" #'org-save-all-org-buffers
|
|
||||||
"w" #'org-switch-workspace)
|
|
||||||
|
|
||||||
(keymap-global-set "C-c a" #'org-agenda)
|
|
||||||
(keymap-global-set "C-c c" #'org-capture)
|
|
||||||
(keymap-global-set "C-c o" org-roam-keymap)
|
|
||||||
|
|
||||||
;; Org hooks
|
|
||||||
(add-hook 'org-mode-hook
|
|
||||||
(lambda ()
|
|
||||||
(modify-syntax-entry ?< ".")
|
|
||||||
(modify-syntax-entry ?> ".")))
|
|
||||||
(add-hook 'org-agenda-mode-hook
|
|
||||||
(lambda ()
|
|
||||||
(add-hook 'auto-save-hook 'org-save-all-org-buffers nil t)
|
|
||||||
(auto-save-mode)))
|
|
||||||
(add-hook 'org-mode-hook #'variable-pitch-mode)
|
|
||||||
(add-hook 'org-agenda-mode-hook #'org-recur-mode)
|
|
||||||
(add-hook 'org-agenda-finalize-hook #'org-modern-agenda)
|
|
||||||
(add-hook 'org-mode-hook #'(lambda ()
|
|
||||||
(setq line-spacing 0.1)
|
|
||||||
(electric-indent-mode -1)))
|
|
||||||
|
|
||||||
;; Diary-syncing functionality
|
|
||||||
(defun pull-diary ()
|
|
||||||
"Syncs the calendars directory and imports the calendars into the diary."
|
|
||||||
(interactive)
|
|
||||||
;; Sync the calendars directory
|
|
||||||
(let ((default-directory (expand-file-name "~/.calendars/")))
|
|
||||||
(shell-command "./sync"))
|
|
||||||
;; Import the calendars into the diary
|
|
||||||
(let* ((diary-file-name (expand-file-name "~/.emacs.d/diary"))
|
|
||||||
(calendar-dir (expand-file-name "~/.calendars/"))
|
|
||||||
(calendar-file-suffix ".ics")
|
|
||||||
(calendar-file? (lambda (f) (s-suffix? calendar-file-suffix f)))
|
|
||||||
(calendar-dir-files (directory-files calendar-dir))
|
|
||||||
(calendar-names (-filter calendar-file? calendar-dir-files))
|
|
||||||
(calendar-files (-map (lambda (f) (expand-file-name f calendar-dir)) calendar-names)))
|
|
||||||
(find-file diary-file-name)
|
|
||||||
(delete-region (point-min) (point-max))
|
|
||||||
(save-buffer)
|
|
||||||
(kill-buffer)
|
|
||||||
(-map (lambda (f)
|
|
||||||
(find-file f)
|
|
||||||
(icalendar-import-buffer diary-file-name t nil)
|
|
||||||
(kill-buffer))
|
|
||||||
calendar-files)
|
|
||||||
(find-file diary-file-name)
|
|
||||||
(delete-duplicate-lines (point-min) (point-max))
|
|
||||||
(save-buffer)
|
|
||||||
(kill-buffer)))
|
|
||||||
|
|
||||||
;; Theme
|
|
||||||
(custom-set-faces
|
|
||||||
'(org-document-info ((t (:inherit nano-strong :height 1.0))))
|
|
||||||
'(org-document-title ((t (:inherit nano-strong :height 1.5 :family "Roboto"))))
|
|
||||||
'(org-document-info-keyword ((t :inherit (nano-faded fixed-pitch))))
|
|
||||||
'(org-level-1 ((t (:inherit nano-strong :extend nil :height 1.4))))
|
|
||||||
'(org-level-2 ((t (:inherit nano-strong :extend nil :height 1.3))))
|
|
||||||
'(org-level-3 ((t (:inherit nano-strong :extend nil :height 1.2))))
|
|
||||||
'(org-level-4 ((t (:inherit nano-strong :extend nil :height 1.1))))
|
|
||||||
'(org-level-4 ((t (:inherit nano-strong :extend nil :height 1.0))))
|
|
||||||
'(org-level-4 ((t (:inherit nano-strong :extend nil :height 1.0))))
|
|
||||||
'(org-link ((t (:inherit nano-salient :underline t))))
|
|
||||||
'(org-code ((t :inherit (nano-salient fixed-pitch))))
|
|
||||||
'(org-verbatim ((t :inherit (nano-popout fixed-pitch))))
|
|
||||||
'(org-indent ((t :inherit (org-hide fixed-pitch))))
|
|
||||||
'(org-table ((t :inherit fixed-pitch)))
|
|
||||||
'(org-block-begin-line ((t :inherit (nano-faded fixed-pitch) :extend t :underline nil)))
|
|
||||||
'(org-block-end-line ((t :inherit (nano-faded fixed-pitch) :extend t :overline nil)))
|
|
||||||
'(org-block ((t :inherit fixed-pitch :background "#f3f3f3" :extend t)))
|
|
||||||
'(org-meta-line ((t :inherit (nano-faded fixed-pitch))))
|
|
||||||
'(org-drawer ((t :inherit (nano-faded fixed-pitch)))))
|
|
||||||
|
|
||||||
|
|
||||||
(provide 'orgconfig)
|
|
||||||
;;; orgconfig.el ends here
|
|
||||||
|
|
@ -3,9 +3,152 @@
|
||||||
;; Provides configuration for org-related packages.
|
;; Provides configuration for org-related packages.
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
(use-package org :straight t)
|
(defvar-keymap org-roam-keymap
|
||||||
|
"n" #'org-roam-capture
|
||||||
|
"f" #'org-roam-node-find
|
||||||
|
"i" #'org-roam-node-insert
|
||||||
|
"t" #'org-roam-tag-add
|
||||||
|
"s" #'org-save-all-org-buffers
|
||||||
|
"w" #'org-switch-workspace)
|
||||||
|
|
||||||
|
(defun org-switch-workspace (&optional workspace-name)
|
||||||
|
"Switch the current org-roam-directory to WORKSPACE-NAME."
|
||||||
|
(interactive)
|
||||||
|
(defconst default-workspace-name (caar org-workspaces-alist))
|
||||||
|
(defconst prompt-message (format "Org Roam Workspace (default \"%s\"): "
|
||||||
|
default-workspace-name))
|
||||||
|
(let ((workspace-name
|
||||||
|
(or workspace-name
|
||||||
|
(completing-read prompt-message
|
||||||
|
org-workspaces-alist
|
||||||
|
nil t nil nil
|
||||||
|
default-workspace-name))))
|
||||||
|
(setq org-roam-directory (cadr (assoc workspace-name org-workspaces-alist)))
|
||||||
|
(setq org-roam-db-location (cddr (assoc workspace-name org-workspaces-alist)))
|
||||||
|
(org-roam-db-sync nil)))
|
||||||
|
|
||||||
|
(defun org-roam-migrate ()
|
||||||
|
"Migrate a regular org file into an org-roam file in my format."
|
||||||
|
(interactive)
|
||||||
|
(unless (eq major-mode 'dired-mode)
|
||||||
|
(error "BAD!"))
|
||||||
|
(dired-find-file)
|
||||||
|
(let* ((id (org-id-get-create))
|
||||||
|
(_ (save-buffer))
|
||||||
|
(new-format "%s-%s.org")
|
||||||
|
(filename-old (buffer-file-name (current-buffer)))
|
||||||
|
(filename-min (file-name-sans-extension filename-old))
|
||||||
|
(filename-new (format new-format filename-min id)))
|
||||||
|
(rename-file filename-old filename-new)
|
||||||
|
(kill-buffer (current-buffer))
|
||||||
|
(revert-buffer)))
|
||||||
|
|
||||||
|
(defun priime-pull-diary ()
|
||||||
|
"Syncs the calendars directory and imports the calendars into the diary."
|
||||||
|
(interactive)
|
||||||
|
;; Sync the calendars directory
|
||||||
|
(let ((default-directory (expand-file-name "~/.calendars/")))
|
||||||
|
(shell-command "./sync"))
|
||||||
|
;; Import the calendars into the diary
|
||||||
|
(let* ((diary-file-name (expand-file-name "~/.emacs.d/diary"))
|
||||||
|
(calendar-dir (expand-file-name "~/.calendars/"))
|
||||||
|
(calendar-file-suffix ".ics")
|
||||||
|
(calendar-file? (lambda (f) (s-suffix? calendar-file-suffix f)))
|
||||||
|
(calendar-dir-files (directory-files calendar-dir))
|
||||||
|
(calendar-names (-filter calendar-file? calendar-dir-files))
|
||||||
|
(calendar-files (-map (lambda (f) (expand-file-name f calendar-dir)) calendar-names)))
|
||||||
|
(find-file diary-file-name)
|
||||||
|
(delete-region (point-min) (point-max))
|
||||||
|
(save-buffer)
|
||||||
|
(kill-buffer)
|
||||||
|
(-map (lambda (f)
|
||||||
|
(find-file f)
|
||||||
|
(icalendar-import-buffer diary-file-name t nil)
|
||||||
|
(kill-buffer))
|
||||||
|
calendar-files)
|
||||||
|
(find-file diary-file-name)
|
||||||
|
(delete-duplicate-lines (point-min) (point-max))
|
||||||
|
(save-buffer)
|
||||||
|
(kill-buffer)))
|
||||||
|
|
||||||
|
(defun priime-setup-org ()
|
||||||
|
"Small setup for `org-mode'."
|
||||||
|
(modify-syntax-entry ?< ".")
|
||||||
|
(modify-syntax-entry ?> ".")
|
||||||
|
(setq line-spacing 0.1)
|
||||||
|
(electric-indent-mode -1))
|
||||||
|
|
||||||
|
(use-package org :straight t
|
||||||
|
:after (ob-racket)
|
||||||
|
:bind (("C-c a" . org-agenda)
|
||||||
|
("C-c c" . org-capture))
|
||||||
|
:custom
|
||||||
|
(org-workspaces-alist '(("docs" . ("~/org/docs/" . "~/.emacs.d/org-roam.db"))))
|
||||||
|
(org-hide-emphasis-markers t)
|
||||||
|
(org-adapt-indentation nil)
|
||||||
|
(org-confirm-babel-evaluate nil)
|
||||||
|
(org-export-use-babel nil)
|
||||||
|
(org-agenda-include-diary t)
|
||||||
|
(org-src-preserve-indentation t)
|
||||||
|
(org-link-frame-setup '((vm . vm-visit-folder-other-frame)
|
||||||
|
(vm-imap . vm-visit-imap-folder-other-frame)
|
||||||
|
(gnus . org-gnus-no-new-news)
|
||||||
|
(file . find-file)
|
||||||
|
(wl . wl-other-frame)))
|
||||||
|
(org-agenda-files '("~/org/gtd.org"))
|
||||||
|
(org-capture-templates '(("t" "Todo [inbox]" entry
|
||||||
|
(file+headline "~/org/gtd.org" "GTD")
|
||||||
|
"* TODO %i%?")))
|
||||||
|
(org-refile-targets '(("~/org/gtd.org" :maxlevel . 3)
|
||||||
|
("~/org/someday.org" :level . 1)
|
||||||
|
("~/org/tickler.org" :maxlevel . 2)))
|
||||||
|
(org-todo-keywords '((sequence "TODO(t)" "WAITING(w)" "|" "DONE(d)" "CANCELLED(c)")))
|
||||||
|
:custom-face
|
||||||
|
(org-document-info ((t (:inherit nano-strong :height 1.0))))
|
||||||
|
(org-document-title ((t (:inherit nano-strong :height 1.5 :family "Roboto"))))
|
||||||
|
(org-document-info-keyword ((t :inherit (nano-faded fixed-pitch))))
|
||||||
|
(org-level-1 ((t (:inherit nano-strong :extend nil :height 1.4))))
|
||||||
|
(org-level-2 ((t (:inherit nano-strong :extend nil :height 1.3))))
|
||||||
|
(org-level-3 ((t (:inherit nano-strong :extend nil :height 1.2))))
|
||||||
|
(org-level-4 ((t (:inherit nano-strong :extend nil :height 1.1))))
|
||||||
|
(org-level-4 ((t (:inherit nano-strong :extend nil :height 1.0))))
|
||||||
|
(org-level-4 ((t (:inherit nano-strong :extend nil :height 1.0))))
|
||||||
|
(org-link ((t (:inherit nano-salient :underline t))))
|
||||||
|
(org-code ((t :inherit (nano-salient fixed-pitch))))
|
||||||
|
(org-verbatim ((t :inherit (nano-popout fixed-pitch))))
|
||||||
|
(org-indent ((t :inherit (org-hide fixed-pitch))))
|
||||||
|
(org-table ((t :inherit fixed-pitch)))
|
||||||
|
(org-block-begin-line ((t :inherit (nano-faded fixed-pitch) :extend t :underline nil)))
|
||||||
|
(org-block-end-line ((t :inherit (nano-faded fixed-pitch) :extend t :overline nil)))
|
||||||
|
(org-block ((t :inherit fixed-pitch :background "#f3f3f3" :extend t)))
|
||||||
|
(org-meta-line ((t :inherit (nano-faded fixed-pitch))))
|
||||||
|
(org-drawer ((t :inherit (nano-faded fixed-pitch))))
|
||||||
|
:hook
|
||||||
|
((org-mode . auto-save-mode)
|
||||||
|
(auto-save . org-save-all-org-buffers)
|
||||||
|
(org-agenda-finalize-hook . org-modern-agenda))
|
||||||
|
:init
|
||||||
|
(keymap-global-set "C-c o" org-roam-keymap)
|
||||||
|
(org-babel-do-load-languages
|
||||||
|
'org-babel-load-languages
|
||||||
|
'((racket . t)
|
||||||
|
(python . t)))
|
||||||
|
(priime-setup-org))
|
||||||
(use-package org-roam :straight t
|
(use-package org-roam :straight t
|
||||||
:after (org))
|
:after (org)
|
||||||
|
:custom
|
||||||
|
(org-roam-directory "~/org/docs")
|
||||||
|
(org-roam-extract-new-file-path "${slug}.org")
|
||||||
|
(org-roam-node-display-template
|
||||||
|
(concat "${title} " "(${id:8}) " (propertize "[${tags}]" 'face 'org-tag)))
|
||||||
|
(org-roam-capture-templates '(("n" "default" plain "%?"
|
||||||
|
:target (file+head "${slug}-${id}.org" "#+title: ${title}\n")
|
||||||
|
:unnarrowed t)
|
||||||
|
("N" "encrypted" plain "%?"
|
||||||
|
:target (file+head "${slug}-${id}.org.gpg" "#+title: ${title}\n")
|
||||||
|
:unnarrowed t)))
|
||||||
|
:init
|
||||||
|
(org-roam-db-autosync-mode))
|
||||||
(use-package org-modern :straight t
|
(use-package org-modern :straight t
|
||||||
:after (org)
|
:after (org)
|
||||||
:hook (org-mode . org-modern-mode)
|
:hook (org-mode . org-modern-mode)
|
||||||
|
|
@ -24,7 +167,10 @@
|
||||||
'(ob-racket
|
'(ob-racket
|
||||||
:type git
|
:type git
|
||||||
:host github
|
:host github
|
||||||
:repo "hasu/emacs-ob-racket"))
|
:repo "hasu/emacs-ob-racket")
|
||||||
|
:custom
|
||||||
|
(org-babel-default-header-args:racket '((:session . "none")
|
||||||
|
(:results . "output"))))
|
||||||
|
|
||||||
(provide 'priime-org)
|
(provide 'priime-org)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@
|
||||||
(load-library "priime-org")
|
(load-library "priime-org")
|
||||||
(load-library "priime-languages")
|
(load-library "priime-languages")
|
||||||
|
|
||||||
(load-library "orgconfig")
|
|
||||||
(when (eq system-type 'gnu/linux)
|
(when (eq system-type 'gnu/linux)
|
||||||
(load-library "mu4econfig"))
|
(load-library "mu4econfig"))
|
||||||
(load-library "racket")
|
(load-library "racket")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue