Update org config

2 files changed, 14 insertions, 123 deletions

diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el
index 63c8557..69fdc8b 100644
--- a/emacs/.doom.d/config.el
+++ b/emacs/.doom.d/config.el
@@ -27,134 +27,25 @@
 
 ;; 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!
-(setq org-directory "~/org/")
-(use-package! org
-  :config
-  (setq org-todo-keywords
-        '((sequence
-          "TODO(t)" "ACTIVE(a!)" "WAIT(w@/!)" "|" "DONE(d!)" "CANCELED(c@)")))
-  (setq org-refile-use-outline-path nil)
-  (setq org-refile-targets '((nil . (:maxlevel . 2)))))
-
+(setq org-directory "~/org")
+(setq org-todo-keywords
+      '((sequence
+         "TODO(t)" "ACTIVE(a!)" "WAIT(w@/!)" "|" "DONE(d!)" "CANCELED(c@)")))
+(setq org-refile-use-outline-path nil)
+(setq org-refile-targets '((nil . (:maxlevel . 2))))
 (setq org-log-into-drawer t)
 (setq org-agenda-log-mode-items '(closed clock state))
 (setq org-agenda-files '("~/org/roam/todo.org"))
-
-(use-package! org-agenda
-  :config
-  (setq org-agenda-ndays 14)
-  (setq org-agenda-include-diary 1)
-  (setq org-agenda-todo-ignore-with-date 1)
-  (setq org-agenda-todo-ignore-scheduled 1)
-  (setq org-agenda-start-with-log-mode 1)
-  (setq org-agenda-window-setup 'current-window)
-  (setq org-agenda-custom-commands
-        '(("g" "Google agenda"
-           ((agenda "")
-            (todo "ACTIVE")
-            (alltodo))
-           )))
-  (setq org-capture-templates
-        `(
-          ("t" "Todo" entry (file+headline "~/org/roam/todo.org" "Inbox")
-           "* TODO %?\n  %i\n  %a")
-          ("d" "Daily review" entry (file+olp+datetree "~/org/review.org" "Daily")
-           (file "~/org/templates/daily-review.org") :tree-type week :jump-to-captured t)
-          ("w" "Weekly review" entry (file+olp+datetree "~/org/review.org" "Weekly")
-           (file "~/org/templates/weekly-review.org") :tree-type week :jump-to-captured t)
-          ("j" "Journal entry" entry (file+olp+datetree "~/org/journal.org" "Journal")
-           "* Journal entry\n%t\n\n%?" :tree-type week :jump-to-captured t)
-          )))
-
-(setq org-roam-directory "~/org/roam")
-(use-package! org)
-;; (use-package! org-roam
-;;   :after org
-;;   :init
-;;   (setq org-roam-directory "~/org/roam")
-;;   (setq org-roam-capture-templates
-;;         '(
-;;           ("d" "default" plain (function org-roam-capture--get-point)
-;;            "%?"
-;;            :file-name "%<%Y%m%d%H%M%S>-${slug}"
-;;            :head "#+TITLE: ${title}\n"
-;;            :unnarrowed t)
-;;           )))
-
-(setq deft-directory "~/org/")
+(setq org-roam-directory (concat org-directory "/roam"))
+(setq org-roam-db-location (concat org-roam-directory "/org-roam.db"))
+(setq deft-directory org-directory)
 (setq deft-recursive t)
 
-;; 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'.
-(setq display-line-numbers-type t)
-
-;; Here are some additional functions/macros that could help you configure Doom:
-;;
-;; - `load!' for loading external *.el files relative to this one
-;; - `use-package' for configuring packages
-;; - `after!' for running code after a package has loaded
-;; - `add-load-path!' for adding directories to the `load-path', relative to
-;;   this file. Emacs searches the `load-path' when you load packages with
-;;   `require' or `use-package'.
-;; - `map!' for binding new keys
-;;
-;; To get information about any of these functions/macros, move the cursor over
-;; the highlighted symbol at press 'K' (non-evil users must press 'C-c g k').
-;; This will open documentation for it, including demos of how they are used.
-;;
-;; You can also try 'gd' (or 'C-c g d') to jump to their definition and see how
-;; they are implemented.
-
-(after! smartparens
-  (smartparens-global-mode -1))
-
-(after! mu4e-maildirs-extension
-  (mu4e-maildirs-extension))
-(after! mu4e
-  (remove-hook 'mu4e-compose-mode-hook #'org-mu4e-compose-org-mode))
-
-;; (setq hledger-jfile "~/.hledger.journal")
-
-;; (use-package! hledger-mode
-;;   :defer t
-;;   :mode ("\\.journal\\'" "\\.hledger\\'")
-;;   :commands hledger-enable-reporting
-;;   :preface
-;;   (defun hledger/next-entry ()
-;;     "Move to next entry and pulse."
-;;     (interactive)
-;;     (hledger-next-or-new-entry)
-;;     (hledger-pulse-momentary-current-entry))
-
-;;   (defface hledger-warning-face
-;;     '((((background dark))
-;;        :background "Red" :foreground "White")
-;;       (((background light))
-;;        :background "Red" :foreground "White")
-;;       (t :inverse-video t))
-;;     "Face for warning"
-;;     :group 'hledger)
-
-;;   (defun hledger/prev-entry ()
-;;     "Move to last entry and pulse."
-;;     (interactive)
-;;     (hledger-backward-entry)
-;;     (hledger-pulse-momentary-current-entry))
-
-;;   :config
-;;   (set-company-backend! 'hledger-mode '(hledger-company))
-
-;;   (map! :map hledger-mode-map
-;;         "M-p" #'hledger/prev-entry
-;;         "M-n" #'hledger/next-entry
-;;         :localleader
-;;         "e" #'hledger-jentry
-;;         "j" #'hledger-run-command)
-;;   )
+;; Allow more keys when navigating with avy.
+(setq avy-keys (number-sequence ?a ?z))
 
 (server-start)
 (remove-hook 'doom-first-buffer-hook #'smartparens-global-mode)
-
 (add-to-list 'auto-mode-alist '("\\.journal\\'" . ledger-mode))
 (after! racket-mode
   (remove-hook! 'racket-mode #'racket-smart-open-bracket-mode))
diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el
index 7e0bb0f..f3cce03 100644
--- a/emacs/.doom.d/init.el
+++ b/emacs/.doom.d/init.el
@@ -75,7 +75,7 @@
        ;;eshell            ; the elisp shell that works everywhere
        shell             ; simple shell REPL for Emacs
        ;;term              ; basic terminal emulator for Emacs
-       ;;vterm             ; the best terminal emulation in Emacs
+       vterm             ; the best terminal emulation in Emacs
 
        :checkers
        syntax              ; tasing you for every semicolon you forget
@@ -141,7 +141,7 @@
        ;;nim               ; python + lisp at the speed of c
        nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
-       (org +journal +roam2)               ; organize your plain life in plain text
+       (org +journal +roam2) ; organize your plain life in plain text
        ;;perl              ; write code no one else can comprehend
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
@@ -164,7 +164,7 @@
        ;;yaml              ; JSON, but readable
 
        :email
-       mu4e
+       ;;mu4e
        ;;notmuch
        ;;(wanderlust +gmail)