diff options
| -rw-r--r-- | .emacs | 1 | ||||
| -rw-r--r-- | .emacs.local.d/config.el | 8 | ||||
| -rw-r--r-- | .emacs.local.d/modes/ivy.el | 1 | ||||
| -rw-r--r-- | .emacs.local.d/modes/org-journal.el | 11 | ||||
| -rw-r--r-- | .emacs.local.d/modes/org-roam.el | 2 | ||||
| -rw-r--r-- | .emacs.local.d/modes/org.el | 18 |
6 files changed, 27 insertions, 14 deletions
@@ -19,6 +19,7 @@ (load-file "~/.emacs.local.d/modes/markdown.el") (load-file "~/.emacs.local.d/modes/magit.el") (load-file "~/.emacs.local.d/modes/org.el") +(load-file "~/.emacs.local.d/modes/org-journal.el") (load-file "~/.emacs.local.d/modes/org-roam.el") (load-file "~/.emacs.local.d/modes/projectile.el") (load-file "~/.emacs.local.d/modes/python.el") diff --git a/.emacs.local.d/config.el b/.emacs.local.d/config.el index fafc937..cb3d088 100644 --- a/.emacs.local.d/config.el +++ b/.emacs.local.d/config.el @@ -1,4 +1,4 @@ -(setq org-refile-path "~/refile.org") -(setq org-agenda-files '("~/org/")) - -(setq org-roam-directory "~/org/roam/") +(setq my-org-agenda-files '("~/org/")) +(setq my-org-journal-dir "~/org/journal/") +(setq my-org-refile-path "~/refile.org") +(setq my-org-roam-directory "~/org/roam/") diff --git a/.emacs.local.d/modes/ivy.el b/.emacs.local.d/modes/ivy.el index ca3623c..fcf69ca 100644 --- a/.emacs.local.d/modes/ivy.el +++ b/.emacs.local.d/modes/ivy.el @@ -21,7 +21,6 @@ ("C-x C-f" . counsel-find-file) ("C-x C-r" . counsel-recentf) ; search for recently edited ("C-c g" . counsel-git) ; search for files in git repo - ("C-c j" . counsel-git-grep) ; search for regexp in git repo ("C-c /" . counsel-ag) ; Use ag for regexp ("C-x l" . counsel-locate) ("C-x C-f" . counsel-find-file) diff --git a/.emacs.local.d/modes/org-journal.el b/.emacs.local.d/modes/org-journal.el new file mode 100644 index 0000000..d298f05 --- /dev/null +++ b/.emacs.local.d/modes/org-journal.el @@ -0,0 +1,11 @@ +(use-package org-journal + :ensure t + :defer t + :init + ;; Change default prefix key; needs to be set before loading org-journal + (setq org-journal-prefix-key "C-c j ") + :config + (setq org-journal-dir my-org-journal-dir + org-journal-file-format "%Y.org" + org-journal-file-type 'yearly + org-journal-date-format "%A, %d %B %Y")) diff --git a/.emacs.local.d/modes/org-roam.el b/.emacs.local.d/modes/org-roam.el index 31a20a5..dd19ad8 100644 --- a/.emacs.local.d/modes/org-roam.el +++ b/.emacs.local.d/modes/org-roam.el @@ -1,5 +1,7 @@ (use-package org-roam :ensure t + :custom + (org-roam-directory my-org-roam-directory) :init (setq org-roam-v2-ack t) :bind (("C-c n l" . org-roam-buffer-toggle) diff --git a/.emacs.local.d/modes/org.el b/.emacs.local.d/modes/org.el index 809e288..e0e2e83 100644 --- a/.emacs.local.d/modes/org.el +++ b/.emacs.local.d/modes/org.el @@ -56,26 +56,26 @@ (setq org-log-reschedule (quote time)) ;; CAPTURE ;; -(setq org-default-notes-file org-refile-path) +(setq org-default-notes-file my-org-refile-path) ;; I use C-c c to start capture mode (global-set-key (kbd "C-c c") 'org-capture) ;; Capture templates for: TODO tasks, Notes, appointments, phone calls, meetings, and org-protocol (setq org-capture-templates - (quote (("t" "todo" entry (file org-refile-path) + (quote (("t" "todo" entry (file my-org-refile-path) "* TODO %?\n%U\n%a\n" :clock-in t :clock-resume t) - ("r" "respond" entry (file org-refile-path) + ("r" "respond" entry (file my-org-refile-path) "* NEXT Respond to %:from on %:subject\nSCHEDULED: %t\n%U\n%a\n" :clock-in t :clock-resume t :immediate-finish t) - ("n" "note" entry (file org-refile-path) + ("n" "note" entry (file my-org-refile-path) "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t) - ("w" "org-protocol" entry (file org-refile-path) + ("w" "org-protocol" entry (file my-org-refile-path) "* TODO Review %c\n%U\n" :immediate-finish t) - ("m" "Meeting" entry (file org-refile-path) + ("m" "Meeting" entry (file my-org-refile-path) "* MEETING with %? :MEETING:\n%U" :clock-in t :clock-resume t) - ("p" "Phone call" entry (file org-refile-path) + ("p" "Phone call" entry (file my-org-refile-path) "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t) - ("h" "Habit" entry (file org-refile-path) + ("h" "Habit" entry (file my-org-refile-path) "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"%<<%Y-%m-%d %a .+1d/3d>>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n")))) (add-hook 'org-capture-mode-hook 'delete-other-windows) @@ -98,7 +98,7 @@ ; Targets include this file and any file contributing to the agenda - up to 9 levels deep (setq org-refile-targets (quote ((nil :maxlevel . 9) - (org-agenda-files :maxlevel . 9)))) + (my-org-agenda-files :maxlevel . 9)))) ; Exclude DONE state tasks from refile targets (defun bh/verify-refile-target () |