diff --git a/.gitignore b/.gitignore
index 22c9f22..f984ee3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.cache/
 auto-save-list/
 eln-cache/
 elpa/
diff --git a/config.org b/config.org
index 3e5f598..e623e9f 100644
--- a/config.org
+++ b/config.org
@@ -12,26 +12,13 @@
   (unless (server-running-p) (server-start))
 #+end_src
 
-** Auto-Save
-
-*** Disable Built-In Auto-Save and Backup
+** Disable Built-In Auto-Save and Backup
 
 #+begin_src emacs-lisp
   (setq auto-save-default nil
         make-backup-files nil)
 #+end_src
 
-*** Enable Real Auto-Save
-
-#+begin_src emacs-lisp
-  (use-package real-auto-save
-    :ensure t
-    :hook
-    (prog-mode . real-auto-save-mode)
-    :config
-    (setq real-auto-save-interval 1))
-#+end_src
-
 ** No Scratch On Open
 
 #+begin_src emacs-lisp
@@ -257,10 +244,12 @@
 #+begin_src emacs-lisp
   (use-package ligature
     :config
-    (ligature-set-ligatures 'prog-mode '("<---" "<--"  "<<-" "<-" "->" "-->" "--->" "<->" "<-->" "<--->" "<---->" "<!--"
-                                         "<==" "<===" "<=" "=>" "=>>" "==>" "===>" ">=" "<=>" "<==>" "<===>" "<====>" "<!---"
-                                         "<~~" "<~" "~>" "~~>" "::" ":::" "==" "!=" "===" "!=="
-                                         ":=" ":-" ":+" "<*" "<*>" "*>" "<|" "<|>" "|>" "+:" "-:" "=:" "<******>" "++" "+++"))
+    (let ((common-ligatures '("<---" "<--"  "<<-" "<-" "->" "-->" "--->" "<->" "<-->" "<--->" "<---->" "<!--"
+                              "<==" "<===" "<=" "=>" "=>>" "==>" "===>" ">=" "<=>" "<==>" "<===>" "<====>" "<!---"
+                              "<~~" "<~" "~>" "~~>" "::" ":::" "==" "!=" "===" "!=="
+                              ":=" ":-" ":+" "<*" "<*>" "*>" "<|" "<|>" "|>" "+:" "-:" "=:" "<******>" "++" "+++")))
+      (dolist (mode '(prog-mode org-mode))
+        (ligature-set-ligatures mode common-ligatures)))
     (global-ligature-mode t))
 #+end_src
 
@@ -297,6 +286,7 @@
       (when (not (derived-mode-p 'python-ts-mode))
         (add-hook 'before-save-hook #'eglot-format-buffer -10 t)))
     (add-hook 'eglot-managed-mode-hook #'eglot-format-buffer-on-save)
+    (add-to-list 'eglot-server-programs '(nix-mode . ("nixd")))
     :hook
     (rust-mode . eglot-ensure)
     (rust-ts-mode . eglot-ensure)
@@ -305,6 +295,7 @@
     (python-ts-mode . eglot-ensure)
     (json-mode . eglot-ensure)
     (json-ts-mode . eglot-ensure)
+    (nix-mode . eglot-ensure)
     (yaml-mode . eglot-ensure)
     (yaml-ts-mode . eglot-ensure)
     (c-mode . eglot-ensure)
@@ -320,7 +311,9 @@
     (eldoc-box-max-pixel-width 1024)
     :config
     (setq eldoc-message-function #'ignore)
-    (setq eldoc-idle-delay 0))
+    (setq eldoc-idle-delay 0)
+    (custom-set-faces
+      '(eldoc-box-body ((t (:background "#11111b" :foreground "#cdd6f4"))))))
 #+end_src
 
 *** Apheleia
@@ -356,6 +349,36 @@
     :ensure t)
 #+end_src
 
+*** Corfu
+
+#+begin_src emacs-lisp
+  (use-package corfu
+    :ensure t
+    :custom
+    (corfu-cycle t) ;;cycle through all things
+    (corfu-auto t) ;;autocomplete
+    (corfu-auto-prefix 1) ;; 2 letters to start autocomplete
+    (corfu-auto-delay 0.0) ;; idk 0s to start?
+    :bind (:map corfu-map ("<escape>" . corfu-quit))
+    :init (global-corfu-mode))
+
+  (use-package cape :ensure t)
+
+  ;; get eglot to play nice with corfu
+  (advice-add 'eglot-completion-at-point :around #'cape-wrap-buster)
+
+  (use-package kind-icon
+    :ensure t
+    :after corfu
+    :custom
+    (kind-icon-use-icons t)
+    (kind-icon-default-face 'corfu-default)
+    (kind-icon-blend-background nil)
+    (kind-icon-blend-frac 0.08)
+    :config
+    (add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter))
+#+end_src
+
 ** Rainbow Delimiters
 
 #+begin_src emacs-lisp