diff --git a/config.el b/config.el
index b3ec5a8..bc1cc9d 100644
--- a/config.el
+++ b/config.el
@@ -29,7 +29,13 @@
 
 ;; 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 (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)
+  (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'.
diff --git a/init.el b/init.el
index d093487..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)      ; 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
diff --git a/packages.el b/packages.el
index c974bbf..41f5584 100644
--- a/packages.el
+++ b/packages.el
@@ -1,3 +1,4 @@
+
 ;; -*- no-byte-compile: t; -*-
 ;;; $DOOMDIR/packages.el
 
@@ -16,14 +17,20 @@
 (package! ace-jump-mode)
 ;;(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
+(use-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.
@@ -35,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
+(use-package elpher
   :config
   (advice-add 'elpher-get-gemini-response :around 'tls-nocheck-error-advice))