diff options
| -rw-r--r-- | doom.d/config.el | 175 |
1 files changed, 87 insertions, 88 deletions
diff --git a/doom.d/config.el b/doom.d/config.el index a2cc95b..e82f9e3 100644 --- a/doom.d/config.el +++ b/doom.d/config.el @@ -72,6 +72,12 @@ matt@matthewlemon.com") (global-set-key (kbd "C-c r") 'counsel-rg) (global-set-key (kbd "C-c f") 'counsel-fzf) (global-unset-key (kbd "C-x C-b")) ;; we don't want the old buffer list! +(global-set-key (kbd "C-c -") 'evil-ex-nohighlight) + +;; set for sunrise, sunset in Berwick +(setq calendar-latitude 55.77) +(setq calendar-longitude -2.01) +(setq calendar-location-name "Berwick-upon-Tweed") ;; Swiper (use-package swiper @@ -79,7 +85,6 @@ matt@matthewlemon.com") ;; org-roam (use-package org-roam - :ensure t :custom (org-roam-directory "~/org-roam") :config @@ -102,61 +107,67 @@ matt@matthewlemon.com") ;; Basic agenda stuff -(after! org - (setq org-modules '(org-habit ol-bibtex)) +(use-package org + :bind(("C-c l" . org-store-link) + ("C-c a" . org-agenda) + ("C-c c" . org-capture)) + :config + ;; org agenda should be full screen + (defun open-agenda () + "Open the org-agenda." + (interactive) + (let ((agenda "*Org Agenda*")) + (if (equal (get-buffer agenda) nil) + (org-agenda-list) + (unless (equal (buffer-name (current-buffer)) agenda) + (switch-to-buffer agenda)) + (org-agenda-redo t) + (beginning-of-buffer)))) + + :custom + (org-modules '(org-habit ol-bibtex)) (evil-set-initial-state 'org-capture-mode 'insert) ;; from https://www.reddit.com/r/emacs/comments/hzkyrb/org_capture_evil_go_into_insert_mode/ - (setq org-directory "~/org/") - (setq org-startup-indented nil) - (setq org-hide-leading-stars nil) - (setq org-deadline-warning-days 4) - (setq org-clock-persist 'history) + (org-directory "~/org/") + (org-startup-indented nil) + (org-hide-leading-stars nil) + (org-deadline-warning-days 4) + (org-clock-persist 'history) (org-clock-persistence-insinuate) - (setq org-agenda-span 'day) - (setq org-agenda-start-day "today") - (setq org-directory "~/org") - (setq org-agenda-files (quote ("~/org/home.org" - "~/org/projects.org" - "~/org/refile.org" - "~/org/journal.org" - "~/org/mod.org" - "~/org/notes.org" - "~/org/habits.org"))) - (setq org-default-notes-file (concat org-directory "/notes.org")) - (setq org-agenda-window-setup 'current-window) - (setq org-agenda-start-with-log-mode t) - (setq org-M-RET-may-split-line '(default . nil)) - (setq org-enforce-todo-dependencies t) - (setq org-log-done 'time) - (setq org-log-done-with-time 'note) - (setq diary-file "~/org/diary") - (setq org-agenda-include-diary nil) - (setq org-agenda-diary-file "~/org/calendar/cal.org") - (setq org-agenda-show-future-repeats t) - (setq org-agenda-skip-deadline-if-done t) - (setq org-agenda-skip-scheduled-if-done t) - (setq org-reverse-note-order t) - (setq +org-habit-min-width 45) - (setq org-habit-show-habits t) - (setq org-habit-show-habits-only-for-today nil) - (setq org-agenda-sort-notime-is-late nil) - (setq org-columns-default-format "%50ITEM(Task) %10CLOCKSUM %25TIMESTAMP_IA") - (setq org-archive-location "~/org/archive.org::* From %s") - (setq org-refile-targets (quote ((nil :maxlevel . 9) - (org-agenda-files :maxlevel . 9)))) - - ;; set for sunrise, sunset in Berwick - (setq calendar-latitude 55.77) - (setq calendar-longitude -2.01) - (setq calendar-location-name "Berwick-upon-Tweed") + (org-agenda-span 'day) + (org-agenda-start-day "today") + (org-directory "~/org") + (org-agenda-files (quote ("~/org/home.org" + "~/org/projects.org" + "~/org/refile.org" + "~/org/journal.org" + "~/org/mod.org" + "~/org/notes.org" + "~/org/habits.org"))) + (org-default-notes-file (concat org-directory "/notes.org")) + (org-agenda-window-setup 'current-window) + (org-agenda-start-with-log-mode t) + (org-M-RET-may-split-line '(default . nil)) + (org-enforce-todo-dependencies t) + (org-log-done 'time) + (org-log-done-with-time 'note) + (diary-file "~/org/diary") + (org-agenda-include-diary nil) + (org-agenda-diary-file "~/org/calendar/cal.org") + (org-agenda-show-future-repeats t) + (org-agenda-skip-deadline-if-done t) + (org-agenda-skip-scheduled-if-done t) + (org-reverse-note-order t) + (+org-habit-min-width 45) + (org-habit-show-habits t) + (org-habit-show-habits-only-for-today nil) + (org-agenda-sort-notime-is-late nil) + (org-columns-default-format "%50ITEM(Task) %10CLOCKSUM %25TIMESTAMP_IA") + (org-archive-location "~/org/archive.org::* From %s") + (org-refile-targets (quote ((nil :maxlevel . 9) + (org-agenda-files :maxlevel . 9)))) - ;; Basic org keybindings - (global-set-key "\C-cl" 'org-store-link) - (global-set-key "\C-ca" 'org-agenda) - (global-set-key "\C-cc" 'org-capture) - (global-set-key "\C-c-" 'evil-ex-nohighlight) - ;; ;; Agenda dispatcher - (setq org-agenda-custom-commands + (org-agenda-custom-commands '( ("w" "Work" ( @@ -194,7 +205,7 @@ matt@matthewlemon.com") ;; org capture templates - (setq org-capture-templates + (org-capture-templates (quote (("i" "Inbox" entry (file+headline "~/org/refile.org" "Inbox") "* %?\nCaptured: %U\n") ("h" "Home Tasks & Notes") @@ -256,46 +267,34 @@ matt@matthewlemon.com") "* %?\n\t%i")))) ;; org tags - (setq org-tag-alist '( - ;; Type - ("brainstorm" . ?b) - ("idea" . ?d) - ;; Context - ("work" . ?w) - ("home" . ?h) - ("errand" . ?e) - ("emacs" . ?E) - ("orgmode" . ?o) - ("joanna" . ?j) - ("harvey" . ?h) - ("sophie" . ?s))) + (org-tag-alist '( + ;; Type + ("brainstorm" . ?b) + ("idea" . ?d) + ;; Context + ("work" . ?w) + ("home" . ?h) + ("errand" . ?e) + ("emacs" . ?E) + ("orgmode" . ?o) + ("joanna" . ?j) + ("harvey" . ?h) + ("sophie" . ?s))) - ;; org agenda should be full screen - (defun open-agenda () - "Open the org-agenda." - (interactive) - (let ((agenda "*Org Agenda*")) - (if (equal (get-buffer agenda) nil) - (org-agenda-list) - (unless (equal (buffer-name (current-buffer)) agenda) - (switch-to-buffer agenda)) - (org-agenda-redo t) - (beginning-of-buffer)))) - ;; Defining stuck projects - (setq org-stuck-projects + (org-stuck-projects '("+LEVEL=2/+PROJ" ("NEXT" "DOING") nil "")) ;; Put state transition logs into a drawer called LOGBOOK - (setq org-log-into-drawer t) + (org-log-into-drawer t) - (setq org-todo-keywords + (org-todo-keywords (quote ((sequence "TODO(t)" "NEXT(n)" "DOING(D)" "PROJ(p)" "|" "DONE(d!)") (sequence "WAITING(w@/!)" "SOMEDAY(s@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)")))) - (setq org-todo-keyword-faces + (org-todo-keyword-faces (quote (("TODO" :foreground "red" :weight bold) ("NEXT" :foreground "cyan" :weight bold) ("PROJ" :foreground "pink" :weight bold) @@ -307,7 +306,7 @@ matt@matthewlemon.com") ("CANCELLED" :foreground "forest green" :weight bold)))) ;; tag stuff automatically dependent on a change of state - (setq org-todo-state-tags-triggers + (org-todo-state-tags-triggers (quote (("CANCELLED" ("CANCELLED" . t)) ("WAITING" ("WAITING" . t)) ("HOLD" ("WAITING") ("HOLD" . t)) @@ -317,15 +316,15 @@ matt@matthewlemon.com") ("DONE" ("WAITING") ("CANCELLED") ("HOLD"))))) ;; Get more priority options - (setq org-highest-priority ?A) - (setq org-default-priority ?C) - (setq org-lowest-priority ?E) + (org-highest-priority ?A) + (org-default-priority ?C) + (org-lowest-priority ?E) - (setq org-priority-faces + (org-priority-faces '((?A . (:foreground "#CC0000" :background "#FFE3E3")) (?B . (:foreground "#64992C" :background "#EBF4DD")) (?C . (:foreground "#64992C" :background "#FFFFFF")))) - (setq org-ellipsis "...")) + (org-ellipsis "...")) (after! deft |