Merge remote-tracking branch 'origin/unstable' into unstable

.config/doom/init.el

@@ -32,7 +32,7 @@
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
        doom-quit         ; DOOM quit-message prompts when you quit Emacs
-       (emoji +unicode)  ; 🙂
+       (emoji +unicode +ascii +github)  ; 🙂
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        hydra
        indent-guides     ; highlighted indent columns

.config/doom/packages.el

@@ -77,3 +77,6 @@
                          "etc"
                          "docs"
                          "contrib/odt/LibreOffice")))
+;; at some point i want to try pulling in some of this
+;; (package! nano-emacs
+;;   :recipe (:host github :repo "rougier/nano-emacs"))

.config/doom/penguin/org.el

@@ -2,28 +2,32 @@
 
 (require 'org)
 (add-hook! 'org-mode-hook 'org-num-mode)
-(setq org-directory "~/org/")
-;; (setq org-noter-notes-search-path '("~/Documents/notes/"))
 (after! org
-  (setq org-fancy-priorities-list '("󰈅󰈅󰈅" "󰈅󰈅" "󰈅"))
-  (setq org-link-file-path-type 'relative)
-  ;; (setq org-agenda-files
-  ;;       '("~/Documents/agendas"))
-  (org-link-set-parameters "rel" :follow #'browse-url :export #'wvxvw/export-rel-url)
-  (set-company-backend!
-    'org-mode
-    'company-capf 'company-files)
-  (setq org-todo-keywords
-	'((sequence
-	   "TODO(t)"
-	   "BLOCKED(b)"
-	   "WIP(w)"
-	   "REVIEW(r)"
-	   "|"
-	   "CLOSED(c)"
-	   "RESOLVED(R)"
-	   "DONE(d)")))
-  )
+  (setq
+   org-link-file-path-type 'relative
+   org-directory "~/Documents/org/"
+   org-roam-directory "~/Documents/org/"
+   org-attach-id-dir ".attach/"
+   +org-capture-journal-file "journal.org"
+   org-agenda-files '("agendas.org")
+   org-fancy-priorities-list '("󰈅󰈅󰈅" "󰈅󰈅" "󰈅")
+   org-link-file-path-type 'relative))
+
+(org-link-set-parameters "rel" :follow #'browse-url :export #'wvxvw/export-rel-url)
+(set-company-backend!
+  'org-mode
+  'company-capf 'company-files)
+(setq org-todo-keywords
+      '((sequence
+	 "TODO(t)"
+	 "BLOCKED(b)"
+	 "WIP(w)"
+	 "REVIEW(r)"
+	 "|"
+	 "CLOSED(c)"
+	 "RESOLVED(R)"
+	 "DONE(d)")))
+)