diff --git a/hosts/macbook/configuration.nix b/hosts/macbook/configuration.nix
index 782c06d..049aa6e 100644
--- a/hosts/macbook/configuration.nix
+++ b/hosts/macbook/configuration.nix
@@ -7,7 +7,7 @@
   imports = [
     inputs.home-manager.darwinModules.default
     ../../modules/nix-darwin/system.nix
-    ../../modules/nix-darwin/aerospace.nix
+    #../../modules/nix-darwin/aerospace.nix
   ];
 
   nixpkgs.hostPlatform = "aarch64-darwin";
@@ -49,9 +49,6 @@
         cmd - return : kitty
       '';
     };
-    aerospace = {
-      enable = true;
-    };
   };
 
   home-manager = {
diff --git a/modules/home-manager/emacs/emacs.d/config.org b/modules/home-manager/emacs/emacs.d/config.org
index af953c4..b00072f 100644
--- a/modules/home-manager/emacs/emacs.d/config.org
+++ b/modules/home-manager/emacs/emacs.d/config.org
@@ -16,7 +16,7 @@
   - [[#enable-table-of-contents][Enable Table of Contents]]
   - [[#enable-org-bullets][Enable org bullets]]
   - [[#block-expansion][Block expansion]]
-  - [[#org-roam][Org Roam]]
+  - [[#caldav-sync][caldav sync]]
 - [[#completion-framework][Completion Framework]]
 - [[#completion-at-point][COMPLETION AT POINT]]
 - [[#lsp][LSP]]
@@ -142,7 +142,35 @@
 * ORG MODE
 ** General Settings
 #+begin_src emacs-lisp
+  ;; Must do this so the agenda knows where to look for my files
+  (setq org-agenda-files '("~/everything"))
+
+  ;; When a TODO is set to a done state, record a timestamp
+  (setq org-log-done 'time)
+
+  ;; Follow the links
+  (setq org-return-follows-link  t)
+
+  ;; Make the indentation look nicer
   (add-hook 'org-mode-hook 'org-indent-mode)
+
+  ;; Remap the change priority keys to use the UP or DOWN key
+  (define-key org-mode-map (kbd "C-c <up>") 'org-priority-up)
+  (define-key org-mode-map (kbd "C-c <down>") 'org-priority-down)
+
+  ;; Shortcuts for storing links, viewing the agenda, and starting a capture
+  (define-key global-map "\C-cl" 'org-store-link)
+  (define-key global-map "\C-ca" 'org-agenda)
+  (define-key global-map "\C-cc" 'org-capture)
+
+  ;; When you want to change the level of an org item, use SMR
+  (define-key org-mode-map (kbd "C-c C-g C-r") 'org-shiftmetaright)
+
+  ;; Hide the markers so you just see bold text as BOLD-TEXT and not *BOLD-TEXT*
+  (setq org-hide-emphasis-markers t)
+
+  ;; Wrap the lines in org mode so that things are easier to read
+  (add-hook 'org-mode-hook 'visual-line-mode)
 #+end_src
 
 ** Enable Table of Contents
@@ -165,27 +193,16 @@
 #+begin_src emacs-lisp
   (require 'org-tempo)
 #+end_src
-
-** Org Roam
+** Org caldav
 #+begin_src emacs-lisp
-  (use-package org-roam
+  (use-package org-caldav
     :ensure t
-    :custom
-    (org-roam-directory "~/everything")
-    (org-roam-completion-everywhere t)
-    (org-roam-dailies-capture-templates
-      '(("d" "default" entry "* %<%I:%M %p>: %?"
-         :if-new (file+head "%<%Y-%m-%d>.org" "#+title: %<%Y-%m-%d>\n"))))
-    :bind (("C-c n l" . org-roam-buffer-toggle)
-           ("C-c n f" . org-roam-node-find)
-           ("C-c n g" . org-roam-graph)
-           ("C-c n i" . org-roam-node-insert)
-           ("C-c n c" . org-roam-capture)
-           ;; Dailies
-           ("C-c n j" . org-roam-dailies-capture-today))
     :config
-    (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
-    (org-roam-db-autosync-mode))
+    (setq org-caldav-url "https://nextcloud.michaelthomson.dev/remote.php/dav/calendars/mthomson")
+    (setq org-caldav-calendar-id "personal")
+    (setq org-caldav-inbox "~/everything/calendar.org")
+    (setq org-caldav-files nil)
+    (setq org-icalendar-timezone "America/Toronto"))
 #+end_src
 
 * Completion Framework
diff --git a/modules/home-manager/nixvim/default.nix b/modules/home-manager/nixvim/default.nix
index 3b21576..29d718f 100644
--- a/modules/home-manager/nixvim/default.nix
+++ b/modules/home-manager/nixvim/default.nix
@@ -19,7 +19,7 @@ lib,
     package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
     defaultEditor = true;
     vimdiffAlias = true;
-
+    performance.combinePlugins.enable = true;
     colorschemes = {
       gruvbox = {
         enable = true;
@@ -370,6 +370,13 @@ lib,
           picker = "minipick";
         };
       };
+      orgmode = {
+        enable = true;
+        settings = {
+          org_agenda_files = "~/everything/**/*";
+          org_default_notes_file = "~/everything/refile.org";
+        };
+      };
       render-markdown = {
         enable = true;
       };