diff options
-rw-r--r-- | doom/config.el | 35 | ||||
-rw-r--r-- | doom/packages.el | 1 | ||||
-rwxr-xr-x | install.sh | 11 |
3 files changed, 29 insertions, 18 deletions
diff --git a/doom/config.el b/doom/config.el index 9ce5089..a56220c 100644 --- a/doom/config.el +++ b/doom/config.el @@ -105,11 +105,20 @@ ;; Mac configuration (when (eq system-type 'darwin) - (setq mac-right-option-modifier 'none - mac-option-key-is-meta nil - mac-command-key-is-meta t - mac-command-modifier 'meta - mac-option-modifier nil)) + (progn (setq mac-right-option-modifier 'none + mac-option-key-is-meta nil + mac-command-key-is-meta t + mac-command-modifier 'meta + mac-option-modifier nil) + + (defun ymhg/apply-theme (appearance) + "Load theme, taking current system APPEARANCE into consideration." + (mapc #'disable-theme custom-enabled-themes) + (pcase appearance + ('light (load-theme 'modus-operandi t)) + ('dark (load-theme 'modus-vivendi t)))) + + (add-hook 'ns-system-appearance-change-functions #'ymhg/apply-theme))) (defun y/insert-date () "Insert a timestamp according to locale's date and time format." @@ -310,6 +319,7 @@ "TODO(t)" ; A task that needs doing & is ready to do "PROJ(p)" ; A project, which usually contains other tasks "STRT(s)" ; A task that is in progress + "DELG(d)" ; A task that is in progress "WAIT(w)" ; Something external is holding up this task "HOLD(h)" ; This task is paused/on hold because of me "DELG(l)" ; This task is delegated @@ -450,7 +460,6 @@ (setq appt-message-warning-time 15) (run-at-time 10 nil #'appt-activate 1)) - ;; Set up org ref for PDFs (use-package! org-ref :demand @@ -468,14 +477,6 @@ :config (setq org-transclusion-exclude-elements '(property-drawer headline))) -;; Set up org-noter -(use-package! org-noter - :after org - :commands org-noter - :config (setq org-noter-default-notes-file-names '("notes.org") - org-noter-notes-search-path '("~/org/bibliography") - org-noter-separate-notes-from-heading t)) - (use-package! org-superstar :hook (org-mode . org-superstar-mode) :config @@ -779,6 +780,12 @@ (setq message-send-mail-function 'message-send-mail-with-sendmail) +(use-package! sendmail + :config + (if (eq system-type 'darwin) + (setq sendmail-program "/usr/local/bin/msmtp") + (setq sendmail-program "/usr/bin/msmtp"))) + (setq message-signature "Yann Herklotz Imperial College London https://yannherklotz.com") diff --git a/doom/packages.el b/doom/packages.el index 8bf72b3..3298904 100644 --- a/doom/packages.el +++ b/doom/packages.el @@ -55,7 +55,6 @@ ;; `org-mode' dependencies (package! org-ref) -(package! org-noter) ;; `org-bullets' replacement (package! org-superstar) (package! ox-reveal) @@ -91,17 +91,22 @@ fi if [[ ! -z $DOOM ]] || [[ -z $NOT_ALL ]]; then echo "Installing doom config..." - ln_configs doom ~/.config/doom + mk ~/.config/doom + ln_configs doom/config.el ~/.config/doom/config.el + ln_configs doom/init.el ~/.config/doom/init.el + ln_configs doom/packages.el ~/.config/doom/packages.el fi if [[ ! -z $MSMTP ]] || [[ -z $NOT_ALL ]]; then echo "Installing msmtp config..." - ln_configs msmtp ~/.config/msmtp + mk ~/.config/msmtp + ln_configs msmtp/config ~/.config/msmtp/config fi if [[ ! -z $ZATHURA ]] || [[ -z $NOT_ALL ]]; then echo "Installing zathura config..." - ln_configs zathura ~/.config/zathura + mk ~/.config/zathura + ln_configs zathura/zathurarc ~/.config/zathura/zathurarc fi if [[ ! -z $AFEW ]] || [[ -z $NOT_ALL ]]; then |