diff options
Diffstat (limited to 'doom.d/config.el')
| -rw-r--r-- | doom.d/config.el | 443 |
1 files changed, 242 insertions, 201 deletions
diff --git a/doom.d/config.el b/doom.d/config.el index 22b6ae1..69c1772 100644 --- a/doom.d/config.el +++ b/doom.d/config.el @@ -18,7 +18,7 @@ ;; - `doom-unicode-font' -- for unicode glyphs ;; - `doom-serif-font' -- for the `fixed-pitch-serif' face ;; -(setq doom-font (font-spec :family "Iosevka Regular" :size 18) +(setq doom-font (font-spec :family "Iosevka Regular" :size 20) doom-variable-pitch-font (font-spec :family "Iosevka Regular" :size 20)) ;; ;; See 'C-h v doom-font' for documentation and more examples of what they @@ -35,7 +35,7 @@ ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the ;; `load-theme' function. This is the default: -(setq doom-theme 'doom-gruvbox) +(setq doom-theme 'doom-laserwave) ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. @@ -44,177 +44,221 @@ ;; If you use `org' and don't want your org files in the default location below, ;; change `org-directory'. It must be set before org loads! ;; +;; -------------------- +;; Some of my own stuff +;; -------------------- +;; +;;Switch to scratch buffer +(defun mrl/switch-to-scratch () + (interactive) + (switch-to-buffer "*scratch*")) +;; +;; -------------------- +;; Custom keybindings +;; -------------------- +(global-set-key (kbd "C-c s") 'mrl/switch-to-scratch) ;; Basic agenda stuff (after! org - (setq org-directory "~/org/") - (setq org-deadline-warning-days 4) - (setq org-clock-persist 'history) - (org-clock-persistence-insinuate) - (setq org-agenda-span 'week) - (setq org-agenda-start-day "today") - (setq org-directory "~/org") - (setq org-agenda-files (quote ("~/org/home.org" - "~/org/projects.org" - "~/org/journal.org" - "~/org/work.org" - "~/org/notes.org" - "~/org/habits.org" - "~/org/calendar/cal.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-graph-column 45) - (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)))) + (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-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-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)))) - ;; Basic org keybindings - (global-set-key "\C-cl" 'org-store-link) - (global-set-key "\C-ca" 'org-agenda) - (global-set-key "\C-cb" 'org-iswitchb) - (global-set-key "\C-cc" 'org-capture) - ;; - ;; Agenda dispatcher - (setq org-agenda-custom-commands - '(("w" . "Work") - ("wt" "Agenda + Work TODO" - ( - (agenda "") - (tags-todo "+@work-TODO=\"WAITING\"-SCHEDULED>=\"<today>\"" - ((org-agenda-overriding-header "Work TODO UNSCHEDULED"))) - (tags-todo "+@work+TODO=\"WAITING\"" - ((org-agenda-overriding-header "Work WAITING"))) - )) - ("wn" "Agenda + Work NEXT" - ( - (agenda) - (tags-todo "+@work+TODO=\"NEXT\"-SCHEDULED>=\"<today>\"" - ((org-agenda-overriding-header "Work NEXT UNSCHEDULED"))) - (tags-todo "+@work+TODO=\"WAITING\"" - ((org-agenda-overriding-header "Work WAITING"))) - )) - ("wp" "Work Project NEXT" - ( - (agenda) - (tags-todo "+@work+TODO=\"NEXT\"+CATEGORY=\"Project\"" - ((org-agenda-overriding-header "Work Project NEXT actions"))) - )) - ("h" . "Home") - ("hh" "Agenda + Home TODO" - ( - (agenda "") - (tags-todo "@home-SCHEDULED>=\"<today>\"-TODO=\"WAITING\"-TODO=\"DOING\"" - ((org-agenda-overriding-header "Home TODO UNSCHEDULED") - (org-agenda-sorting-strategy '(deadline-down scheduled-down priority-down)))) - (tags-todo "+@home+TODO=\"WAITING\"" - ((org-agenda-overriding-header "Home WAITING"))) - (tags-todo "+@home+TODO=\"DOING\"" ((org-agenda-overriding-header "Home in progress"))) - )) - ("hn" "Agenda + Home NEXT" - ( - (agenda "") - (tags-todo "+@home+TODO=\"NEXT\"-SCHEDULED>=\"<today>\"" - ((org-agenda-overriding-header "Home NEXT UNSCHEDULED") - (org-agenda-sorting-strategy '(deadline-down scheduled-down priority-down)))) - (tags-todo "+@home+TODO=\"DOING\"" - ((org-agenda-overriding-header "Home in progress"))) - )) - ("n" "Agenda + All NEXT" - ( - (agenda "") - (todo "NEXT"))) - ("t" "Agenda + All TODO" - ( - (agenda "") - (alltodo ""))) - ("W" "Agenda + All WAITING" - ( - (agenda "") - (todo "WAITING"))) - ("i" tags "idea") - )) + ;; set for sunrise, sunset in Berwick + (setq calendar-latitude 55.77) + (setq calendar-longitude -2.01) + (setq calendar-location-name "Berwick-upon-Tweed") - ;; org capture templates - (setq org-capture-templates - (quote (("h" "Home Tasks & Notes") - ("x" "Protocol Capture" entry (file+olp+datetree "~/org/capture.org" "Web Capture") - "* %^{Title or Comment}\nDescription: %:description\nSource: %:link\n%:initial") - ("ht" "Home TODO" entry (file+headline "~/org/home.org" "Tasks") - "** TODO %?\nEntered on %U\n" - :prepend t) - ("hn" "Home NEXT" entry (file+headline "~/org/home.org" "Tasks") - "** NEXT %?\nEntered on %U\n" - :prepend t) - ("hN" "Home Note" entry (file+headline "~/org/home.org" "Notes") - "* %?\nEntered on %U\n") - ("hj" "Journal" entry (file+olp+datetree "~/org/journal.org" "Journal") - "* %?\nEntered on %U\n") - ("hi" "Home Idea" entry (file+headline "~/org/notes.org" "Notes") - "** %? :idea:\nEntered on %U\n") - ("hc" "Home Calendar - Single" entry (file+headline "~/org/home.org" "Calendar") - "* %?\n%^T") - ("hb" "Home Calendar - Block" entry (file+headline "~/org/home.org" "Calendar") - "* %?\n%^t--%^t") - ("w" "Work Tasks & Notes") - ("wt" "Work TODO" entry (file+headline "~/org/work.org" "Tasks") - "** TODO %?\nEntered on %U\n" - :prepend t) - ("wn" "Work NEXT" entry (file+headline "~/org/work.org" "Tasks") - "** NEXT %?\nEntered on %U\n" - :prepend t) - ("wN" "Note" entry (file+headline "~/org/work.org" "Notes") - "* %?\nEntered on %U\n") - ("wc" "Note from Clipboard" entry (file+headline "~/org/work.org" "Notes") - "* %?\n\t\n%c") - ("wr" "Note from Region" entry (file+headline "~/org/work.org" "Notes") - "* %?\n\t\n%i") - ("wj" "Journal" entry (file+olp+datetree "~/org/work.org" "Journal") - "** %?\nEntered on %U\n") - ("wd" "Retrospective Tasks" entry (file+headline "~/org/work.org" "Tasks") - "* DONE %?\nCLOSED: %U") - ("wc" "Work Calendar - Single" entry (file+headline "~/org/work.org" "Calendar") - "* %?\n:PROPERTIES:\n:CATEGORY: WorkCal\n:END:\n%^T") - ("wb" "Work Calendar - Block" entry (file+headline "~/org/work.org" "Calendar") - "* %?\n:PROPERTIES:\n:CATEGORY: WorkCal\n:END:\n%^t--%^t") - ("wp" "Work Calendar - Trip" entry (file+headline "~/org/work.org" "Work Trips") - "* %?\n%^t--%^t") - ("wm" "Work Calendar - Meeting" entry (file+headline "~/org/work.org" "Meetings") - "* %?\n:PROPERTIES:\n:CATEGORY: Meeting\n:END:\n%^T") - ("e" "Emacs Tip") - ("et" "Emacs Tip" entry (file+headline "~/org/emacs-tips.org" "Emacs Tips") - "* %?\n\t%a") - ("er" "Emacs Tip from Region" entry (file+headline "~/org/emacs-tips.org" "Emacs Tips") - "* %?\n\t%i") - ))) - ;; org tags - (setq org-tag-alist '( + ;; Basic org keybindings + (global-set-key "\C-cl" 'org-store-link) + (global-set-key "\C-ca" 'org-agenda) + (global-set-key "\C-cb" 'org-iswitchb) + (global-set-key "\C-cc" 'org-capture) + ;; + ;; Agenda dispatcher + (setq org-agenda-custom-commands + '( + ("D" "Dashboard" + ( + (tags "current" + ((org-agenda-overriding-header "Current Ideas"))) + (tags-todo "PRIORITY=\"A\"" + ((org-agenda-overriding-header "Urgent Tasks"))) + (agenda "") + ) + ) + ("w" . "Work") + ("wt" "Agenda + Work TODO" + ( + (agenda "") + (tags-todo "+CATEGORY=\"MOD\"-TODO=\"WAITING\"-SCHEDULED>=\"<today>\"" + ((org-agenda-overriding-header "Work TODO UNSCHEDULED"))) + (tags-todo "+CATEGORY=\"MOD\"+TODO=\"WAITING\"" + ((org-agenda-overriding-header "Work WAITING"))) + ) + ((org-agenda-category-filter-preset '("+MOD" "+WorkCal" "+Meeting"))) + ) + ("wn" "Agenda + Work NEXT" + ( + (agenda) + (tags-todo "+CATEGORY=\"MOD\"+TODO=\"NEXT\"-SCHEDULED>=\"<today>\"" + ((org-agenda-overriding-header "Work NEXT UNSCHEDULED"))) + (tags-todo "+CATEGORY=\"MOD\"+TODO=\"WAITING\"" + ((org-agenda-overriding-header "Work WAITING"))) + ) + ((org-agenda-category-filter-preset '("+MOD" "+WorkCal" "+Meeting"))) + ) + ("wp" "Work Project NEXT" + ( + (agenda) + (tags-todo "+CATEGORY=\"MOD\"TODO=\"NEXT\"+CATEGORY=\"Project\"" + ((org-agenda-overriding-header "Work Project NEXT actions"))) + )) + ("h" . "Home") + ("hh" "Agenda + Home TODO" + ( + (agenda) + (tags-todo "+CATEGORY=\"home\"-SCHEDULED>=\"<today>\"-TODO=\"WAITING\"-TODO=\"DOING\"" + ((org-agenda-overriding-header "Home TODO UNSCHEDULED") + (org-agenda-sorting-strategy '(deadline-down scheduled-down priority-down)))) + (tags-todo "+CATEGORY=\"home\"+TODO=\"WAITING\"" + ((org-agenda-overriding-header "Home WAITING"))) + (tags-todo "+CATEGORY=\"home\"+TODO=\"DOING\"" ((org-agenda-overriding-header "Home in progress"))) + ) + ((org-agenda-category-filter-preset '("+home"))) + ) + ("hn" "Agenda + Home NEXT" + ( + (agenda "") + (tags-todo "+CATEGORY=\"home\"+TODO=\"NEXT\"-SCHEDULED>=\"<today>\"" + ((org-agenda-overriding-header "Home NEXT UNSCHEDULED") + (org-agenda-sorting-strategy '(deadline-down scheduled-down priority-down)))) + (tags-todo "+CATEGORY=\"home\"+TODO=\"DOING\"" + ((org-agenda-overriding-header "Home in progress"))) + ) + ((org-agenda-category-filter-preset '("+home"))) + ) + ("n" "Agenda + All NEXT" + ( + (agenda "") + (todo "NEXT"))) + ("t" "Agenda + All TODO" + ( + (agenda "") + (alltodo ""))) + ("W" "Agenda + All WAITING" + ( + (agenda "") + (todo "WAITING"))) + ("i" tags "idea") + ("R" tags-todo "REFILE" + ((org-agenda-overriding-header "Review these pages captured from the web"))) + )) + + ;; org capture templates + (setq org-capture-templates + (quote (("h" "Home Tasks & Notes") + ;; ("w" "Protocol Capture" entry (file+headline "~/org/refile.org" "Web Capture") + ;; "* %^{Title or Comment}\nDescription: %:description\nSource: %:link\n%:initial\nCaptured: %U\n") + ("x" "Protocol Capture" entry (file+headline "~/org/refile.org" "Web Capture") + "* TODO Review %:description\nSource: %:link\n%:initial\nCaptured: %U\n" :immediate-finish t) + ("w" "Protocol Capture" entry (file+headline "~/org/refile.org" "Web Capture") + "* %:description\nSource: %:link\n%:initial\nCaptured: %U\n") + ("ht" "Home TODO" entry (file+headline "~/org/home.org" "Tasks") + "** TODO %?\nEntered on %U\n" + :prepend t) + ("hn" "Home NEXT" entry (file+headline "~/org/home.org" "Tasks") + "** NEXT %?\nEntered on %U\n" + :prepend t) + ("hN" "Home Note" entry (file+headline "~/org/home.org" "Notes") + "** %?\nEntered on %U\n") + ("hj" "Journal" entry (file+olp+datetree "~/org/home.org" "Journal") + "** %?\nEntered on %U\n") + ("hi" "Home Idea" entry (file+headline "~/org/home.org" "Notes") + "** %? :idea:\nEntered on %U\n") + ("hc" "Home Calendar - Single" entry (file+headline "~/org/home.org" "Calendar") + "* %?\n%^T") + ("hb" "Home Calendar - Block" entry (file+headline "~/org/home.org" "Calendar") + "* %?\n%^t--%^t") + ("w" "Work Tasks & Notes") + ("wt" "Work TODO" entry (file+headline "~/org/mod.org" "Tasks") + "** TODO %?\nEntered on %U\n" + :prepend t) + ("wn" "Work NEXT" entry (file+headline "~/org/mod.org" "Tasks") + "** NEXT %?\nEntered on %U\n" + :prepend t) + ("wN" "Note" entry (file+headline "~/org/mod.org" "Notes") + "* %?\nEntered on %U\n") + ("wc" "Note from Clipboard" entry (file+headline "~/org/mod.org" "Notes") + "* %?\n\t\n%c") + ("wr" "Note from Region" entry (file+headline "~/org/mod.org" "Notes") + "* %?\n\t\n%i") + ("wj" "Journal" entry (file+olp+datetree "~/org/mod.org" "Journal") + "** %?\nEntered on %U\n") + ("wd" "Retrospective Tasks" entry (file+headline "~/org/mod.org" "Tasks") + "* DONE %?\nCLOSED: %U") + ("ws" "Work Calendar - Single" entry (file+headline "~/org/mod.org" "Calendar") + "* %?\n:PROPERTIES:\n:CATEGORY: WorkCal\n:END:\n%^T") + ("wb" "Work Calendar - Block" entry (file+headline "~/org/mod.org" "Calendar") + "* %?\n:PROPERTIES:\n:CATEGORY: WorkCal\n:END:\n%^t--%^t") + ("wp" "Work Calendar - Trip" entry (file+headline "~/org/mod.org" "Work Trips") + "* %?\n%^t--%^t") + ("wm" "Work Calendar - Meeting" entry (file+headline "~/org/mod.org" "Meetings") + "* %?\n:PROPERTIES:\n:CATEGORY: Meeting\n:END:\n%^T") + ("e" "Emacs Tip") + ("et" "Emacs Tip" entry (file+headline "~/org/emacs-tips.org" "Emacs Tips") + "* %?\n\t%a") + ("er" "Emacs Tip from Region" entry (file+headline "~/org/emacs-tips.org" "Emacs Tips") + "* %?\n\t%i") + ))) + ;; org tags + (setq org-tag-alist '( ;; Depth - ("immersive" . ?i) ;; "Deep" - ("process" . ?p) ;; "Shallow" - ("offdesk" . ?o) ;; "Away from desk" + ("@immersive" . ?i) ;; "Deep" + ("@process" . ?p) ;; "Shallow" + ("@offdesk" . ?o) ;; "Away from desk" ;; Type ("brainstorm" . ?b) ("idea" . ?d) ;; Context ("@work" . ?w) ("@home" . ?h) - ("errand" . ?e) - ("emacs" . ?E) + ("@errand" . ?e) + ("@emacs" . ?E) ;; Energy ("Challenge" . ?1) ("Average" . ?2) @@ -223,40 +267,40 @@ ("Maybe" . ?m) )) - ;; 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)))) + ;; 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)))) - ;; org handling to-do items + ;; org handling to-do items - ;; Put state transition logs into a drawer called LOGBOOK - (setq org-log-into-drawer t) + ;; Put state transition logs into a drawer called LOGBOOK + (setq org-log-into-drawer t) - (setq org-todo-keywords - (quote ((sequence "TODO(t)" "NEXT(n)" "DOING" "|" "DONE(d!)") + (setq org-todo-keywords + (quote ((sequence "TODO(t)" "NEXT(n)" "DOING" "|" "DONE(d!)") (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)") ))) - (setq org-todo-keyword-faces - (quote (("TODO" :foreground "red" :weight bold) - ("NEXT" :foreground "cyan" :weight bold) - ("DOING" :foreground "orchid" :weight bold) - ("DONE" :foreground "forest green" :weight bold) - ("WAITING" :foreground "orange" :weight bold) - ("HOLD" :foreground "magenta" :weight bold) - ("CANCELLED" :foreground "forest green" :weight bold)))) + ;; (setq org-todo-keyword-faces + ;; (quote (("TODO" :foreground "red" :weight bold) + ;; ("NEXT" :foreground "cyan" :weight bold) + ;; ("DOING" :foreground "orchid" :weight bold) + ;; ("DONE" :foreground "forest green" :weight bold) + ;; ("WAITING" :foreground "orange" :weight bold) + ;; ("HOLD" :foreground "magenta" :weight bold) + ;; ("CANCELLED" :foreground "forest green" :weight bold)))) - ;; tag stuff automatically dependent on a change of state - (setq org-todo-state-tags-triggers - (quote (("CANCELLED" ("CANCELLED" . t)) + ;; tag stuff automatically dependent on a change of state + (setq org-todo-state-tags-triggers + (quote (("CANCELLED" ("CANCELLED" . t)) ("WAITING" ("WAITING" . t)) ("HOLD" ("WAITING") ("HOLD" . t)) (done ("WAITING") ("HOLD")) @@ -264,23 +308,20 @@ ("NEXT" ("WAITING") ("CANCELLED") ("HOLD")) ("DONE" ("WAITING") ("CANCELLED") ("HOLD"))))) - ;; Get more priority options - (setq org-highest-priority ?A) - (setq org-default-priority ?C) - (setq org-lowest-priority ?E) + ;; Get more priority options + (setq org-highest-priority ?A) + (setq org-default-priority ?C) + (setq org-lowest-priority ?E) - (setq org-priority-faces - '((?A . (:foreground "#CC0000" :background "#FFE3E3")) - (?B . (:foreground "#64992C" :background "#EBF4DD")) - (?C . (:foreground "#64992C" :background "#FFFFFF")))) - (setq org-ellipsis "...") + (setq org-priority-faces + '((?A . (:foreground "#CC0000" :background "#FFE3E3")) + (?B . (:foreground "#64992C" :background "#EBF4DD")) + (?C . (:foreground "#64992C" :background "#FFFFFF")))) + (setq org-ellipsis "...") ) - - - - - +(after! deft + (setq deft-recursive t)) ;; Whenever you reconfigure a package, make sure to wrap your config in an ;; `after!' block, otherwise Doom's defaults may override your settings. E.g. |