From b1fb131d24988c5f9f34123a56189602d07b78d0 Mon Sep 17 00:00:00 2001 From: niten Date: Thu, 16 Jun 2022 23:04:38 -0700 Subject: [PATCH 1/7] Add org-roam --- packages.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages.el b/packages.el index c974bbf..b6c9992 100644 --- a/packages.el +++ b/packages.el @@ -1,3 +1,4 @@ + ;; -*- no-byte-compile: t; -*- ;;; $DOOMDIR/packages.el @@ -16,6 +17,7 @@ (package! ace-jump-mode) ;;(package! md4rd) (package! noflet) +(package! org-roam) (package! graphviz-dot-mode) From 1b4873046cdeaea10fda28d33c38ef548bed47bb Mon Sep 17 00:00:00 2001 From: niten Date: Sun, 19 Jun 2022 13:12:34 -0700 Subject: [PATCH 2/7] Add org roam feature to emacs --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index d093487..c9875ca 100644 --- a/init.el +++ b/init.el @@ -146,7 +146,7 @@ ;;nim ; python + lisp at the speed of c nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel - (org +journal) ; organize your plain life in plain text + (org +journal +roam) ; organize your plain life in plain text ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more purescript ; javascript, but functional From 33e2640c2f415b54a70f1506287e9d06e46e3588 Mon Sep 17 00:00:00 2001 From: niten Date: Wed, 22 Jun 2022 10:52:06 -0700 Subject: [PATCH 3/7] +roam -> roam2, see https://github.com/org-roam/org-roam/issues/1665 --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index c9875ca..692bbc7 100644 --- a/init.el +++ b/init.el @@ -146,7 +146,7 @@ ;;nim ; python + lisp at the speed of c nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel - (org +journal +roam) ; organize your plain life in plain text + (org +journal +roam2) ; organize your plain life in plain text ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more purescript ; javascript, but functional From e08a0da9b36d38e3c57a2f1b6b1c8dca892e7a7c Mon Sep 17 00:00:00 2001 From: niten Date: Wed, 22 Jun 2022 11:26:51 -0700 Subject: [PATCH 4/7] Add flycheck-clj-kondo for emacs linting --- packages.el | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages.el b/packages.el index b6c9992..00c66bb 100644 --- a/packages.el +++ b/packages.el @@ -18,14 +18,19 @@ ;;(package! md4rd) (package! noflet) (package! org-roam) +(package! flycheck-clj-kondo) + +;; Not sure if this is really needed... +(add-hook! clojure-mode + (require 'flycheck-clj-kondo)) (package! graphviz-dot-mode) -(use-package! marginalia +(package! marginalia :config (marginalia-mode)) -(use-package embark) +(package! embark) (defun tls-nocheck-error-advice (orig-fun &rest args) "Advise a function (with :around) not to check TLS errors. @@ -37,7 +42,7 @@ Usage: (advice-add 'my-function-for-advisement :around 'tls-nocheck-error-advice (let ((gnutls-verify-error nil)) (apply orig-fun args))) -(use-package! elpher +(package! elpher :config (advice-add 'elpher-get-gemini-response :around 'tls-nocheck-error-advice)) From e28541411ad0c64d1bdc4cff0d6803a45d708dfe Mon Sep 17 00:00:00 2001 From: niten Date: Wed, 22 Jun 2022 11:33:52 -0700 Subject: [PATCH 5/7] package! isn't a drop-in replacement for use-package --- packages.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.el b/packages.el index 00c66bb..41f5584 100644 --- a/packages.el +++ b/packages.el @@ -26,7 +26,7 @@ (package! graphviz-dot-mode) -(package! marginalia +(use-package marginalia :config (marginalia-mode)) @@ -42,7 +42,7 @@ Usage: (advice-add 'my-function-for-advisement :around 'tls-nocheck-error-advice (let ((gnutls-verify-error nil)) (apply orig-fun args))) -(package! elpher +(use-package elpher :config (advice-add 'elpher-get-gemini-response :around 'tls-nocheck-error-advice)) From 1b2ccf9dccc6004bb94003179c35f4c1e2d0bc4b Mon Sep 17 00:00:00 2001 From: niten Date: Mon, 27 Jun 2022 10:07:15 -0700 Subject: [PATCH 6/7] Set org & org-roam directories. --- config.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config.el b/config.el index 3b145ff..ed702d7 100644 --- a/config.el +++ b/config.el @@ -29,7 +29,11 @@ ;; 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/") +(let* ((org-dir (file-truename "~/Notes")) + (roam-dir (format "%s/roam" org-dir))) + (make-directory roam-dir 'parents) + (setq org-directory org-dir) + (setq org-roam-directory roam-dir)) ;; 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'. From db24eccd7715bc3dfef37ad3c11bcc96682a5fec Mon Sep 17 00:00:00 2001 From: niten Date: Mon, 27 Jun 2022 10:31:14 -0700 Subject: [PATCH 7/7] Better to accept an env var for org dir. --- config.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config.el b/config.el index ed702d7..9e79840 100644 --- a/config.el +++ b/config.el @@ -29,7 +29,9 @@ ;; 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! -(let* ((org-dir (file-truename "~/Notes")) +(let* ((org-dir (if-let ((org-env-dir (getenv "EMACS_ORG_DIRECTORY"))) + (file-truename org-env-dir) + (file-truename "~/Notes"))) (roam-dir (format "%s/roam" org-dir))) (make-directory roam-dir 'parents) (setq org-directory org-dir)