diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el
index a09038d..9987cbf 100644
--- a/hmModules/emacs/init.el
+++ b/hmModules/emacs/init.el
@@ -733,7 +733,7 @@
   :hook ((org-mode . variable-pitch-mode)
 	 (org-mode . visual-line-mode)
 	 (org-mode . visual-fill-column-mode))
-  :custom ((org-log-done 'time)
+  :custom ((org-log-done nil)
 	   (org-return-follows-link t)
 	   (org-hide-emphasis-markers t)
 	   (visual-fill-column-center-text t)
@@ -758,7 +758,6 @@
 	   (org-ellipsis "…")
 	   )
   :bind (("C-c o l" . org-store-link)
-	 ("C-c o a" . org-agenda)
 	 ("C-c o c" . org-capture)
 	 ("C-c b o" . org-switchb))
   :config
@@ -787,6 +786,7 @@ This is meant to be an helper to be called from the window manager."
   (add-hook 'org-attach-after-change-hook #'ccr/org-attach-save-file-list-to-property))
 
 (use-package org-agenda
+  :after org-super-agenda
   :custom
   (org-agenda-files '("~/org"))
   (org-agenda-tags-column 0)
@@ -797,7 +797,51 @@ This is meant to be an helper to be called from the window manager."
      " ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄"))
   (org-agenda-current-time-string
    "◀── now ─────────────────────────────────────────────────")
-  :bind (("C-c o a" . org-agenda)))
+  (org-super-agenda-groups
+   '(;; Each group has an implicit boolean OR operator between its selectors.
+     (:name "Today"		; Optionally specify section name
+            :time-grid t		; Items that appear on the time grid
+            :todo "TODAY")	; Items that have this TODO keyword
+     (:name "Important"
+            ;; Single arguments given alone
+            :tag "bills"
+            :priority "A")
+     ;; Set order of multiple groups at once
+     (:order-multi (2 (:name "Shopping in town"
+                             ;; Boolean AND group matches items that match all subgroups
+                             :and (:tag "shopping" :tag "@town"))
+                      (:name "Food-related"
+                             ;; Multiple args given in list with implicit OR
+                             :tag ("food" "dinner"))
+                      (:name "Personal"
+                             :habit t
+                             :tag "personal")
+                      (:name "Space-related (non-moon-or-planet-related)"
+                             ;; Regexps match case-insensitively on the entire entry
+                             :and (:regexp ("space" "NASA")
+					   ;; Boolean NOT also has implicit OR between selectors
+					   :not (:regexp "moon" :tag "planet")))))
+     ;; Groups supply their own section names when none are given
+     (:todo "WAITING" :order 8)	; Set order of this section
+     (:todo ("SOMEDAY" "TO-READ" "CHECK" "TO-WATCH" "WATCHING")
+            ;; Show this group at the end of the agenda (since it has the
+            ;; highest number). If you specified this group last, items
+            ;; with these todo keywords that e.g. have priority A would be
+            ;; displayed in that group instead, because items are grouped
+            ;; out in the order the groups are listed.
+            :order 9)
+     (:priority<= "B"
+		  ;; Show this section after "Today" and "Important", because
+		  ;; their order is unspecified, defaulting to 0. Sections
+		  ;; are displayed lowest-number-first.
+		  :order 1)
+     ;; After the last group, the agenda will display items that didn't
+     ;; match any of these groups, with the default order position of 99
+     ))
+  :bind (("C-c o a" . org-agenda))
+  :config
+  (org-super-agenda-mode)
+  )
 
 (use-package org-modern
   :after org