update

2 files changed, 26 insertions, 21 deletions

diff --git a/doom.d/config.el b/doom.d/config.el
index 690789c..cae9e28 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -7,7 +7,8 @@
 ;; Some functionality uses this to identify you, e.g. GPG configuration, email
 ;; clients, file templates and snippets. It is optional.
 (setq user-full-name "Matthew Lemon"
-      user-mail-address "matt@matthewlemon.com")
+      user-mail-address "
+matt@matthewlemon.com")
 
 ;; Doom exposes five (optional) variables for controlling fonts in Doom:
 ;;
@@ -18,8 +19,8 @@
 ;; - `doom-unicode-font' -- for unicode glyphs
 ;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
 ;;
-(setq doom-font (font-spec :family "Iosevka Regular" :size 16)
-      doom-variable-pitch-font (font-spec :family "Iosevka Regular" :size 16))
+(setq doom-font (font-spec :family "Jetbrains Mono" :size 16)
+      doom-variable-pitch-font (font-spec :family "Jetbrains Mono" :size 16))
 ;;
 ;; See 'C-h v doom-font' for documentation and more examples of what they
 ;; accept. For example:
@@ -76,6 +77,7 @@
 (use-package org-roam
   :custom
   (org-roam-directory "~/org-roam")
+  (setq org-roam-dailies-directory "daily/")
   (org-roam-complete-everywhere t)
   (setq org-roam-capture-templates
         '(("d" "default" plain
@@ -87,8 +89,8 @@
            :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org.gpg" "#+title: ${title}\n")
            :unnarrowed t)))
   (setq org-roam-dailies-capture-templates
-        '(("d" "default" entry "* %<%H:%M>: %?"
-           :if-new (file+head "%<%Y-%m-%d>.org" "#+title: %<%Y-%m-%d>\n")
+        '(("d" "default" entry "* %<%T>: %?"
+           :target (file+head "%<%Y-%m-%d>.org" "#+title: %<%Y-%m-%d>\n")
            :unnarrowed t))))
 
 ;; Basic agenda stuff
@@ -127,6 +129,8 @@
   (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")
@@ -291,17 +295,17 @@
   ;; 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)
+                        ("@work" . ?w)
+                        ("@home" . ?h)
+                        ("@errand" . ?e)
+                        ("@emacs" . ?E)
                         ;; Energy
                         ("Challenge" . ?1)
                         ("Average" . ?2)
diff --git a/doom.d/init.el b/doom.d/init.el
index b14d677..af987b7 100644
--- a/doom.d/init.el
+++ b/doom.d/init.el
@@ -33,12 +33,13 @@
        doom-dashboard    ; a nifty splash screen for Emacs
        ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
        ;;(emoji +unicode)  ; 🙂
-       hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
-       ;;hydra
-       ;;indent-guides     ; highlighted indent columns
-       ;;ligatures         ; ligatures and symbols to make your code pretty again
-       ;;minimap           ; show a map of the code on the side
-       modeline          ; snazzy, Atom-inspired modeline, plus API
+       ;; hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
+       ;; ;;hydra
+       ;; ;;indent-guides     ; highlighted indent columns
+       ;; ;;ligatures         ; ligatures and symbols to make your code pretty again
+       ;; ;;minimap           ; show a map of the code on the side
+       ;; modeline
+                                        ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
        ;;neotree           ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
@@ -58,10 +59,10 @@
        fold              ; (nigh) universal code folding
        (format +onsave)  ; automated prettiness
        ;;god               ; run Emacs commands without modifier keys
-       lispy             ; vim for lisp, for people who don't like vim
+       ;;lispy             ; vim for lisp, for people who don't like vim
        ;;multiple-cursors  ; editing in many places at once
        ;;objed             ; text object editing for the innocent
-       ;;parinfer          ; turn lisp into python, sort of
+       parinfer          ; turn lisp into python, sort of
        ;;rotate-text       ; cycle region at point between text candidates
        snippets          ; my elves. They type so I don't have to
        ;;word-wrap         ; soft wrapping with language-aware indent
@@ -182,7 +183,7 @@
        ;;(wanderlust +gmail)
 
        :app
-       ;;calendar
+       calendar
        ;;emms
        ;;everywhere        ; *leave* Emacs!? You must be joking
        ;;irc               ; how neckbeards socialize