diff --git a/emacs/config.org b/emacs/config.org
index 9f97789..539a880 100644
--- a/emacs/config.org
+++ b/emacs/config.org
@@ -240,9 +240,13 @@ https://github.com/doomemacs/doomemacs/tree/master/modules/completion
 
 #+name:doom-completion
 #+begin_src emacs-lisp :tangle no
-(company           ; the ultimate code completion backend
- +childframe       ; not quite a window & not quite a frame
-; +tng              ; Use tab instead of ctrl+space
+;; (company           ; the ultimate code completion backend
+;;  +childframe       ; not quite a window & not quite a frame
+;; ; +tng              ; Use tab instead of ctrl+space
+;;  )
+(corfu
+ +icons
+ +orderless
  )
 ;;helm              ; the *other* search engine for love and lifes
 ;;ido               ; the other *other* search engine...
@@ -367,7 +371,7 @@ https://github.com/doomemacs/doomemacs/tree/master/modules/tools
 (debugger +lsp)         ; FIXME stepping through code, to help you add bugs
 ;;direnv
 ;;docker
-;;editorconfig      ; let someone else argue about tabs vs spaces
+editorconfig      ; let someone else argue about tabs vs spaces
 ;;ein               ; tame Jupyter notebooks with emacs
 (eval +overlay)     ; run code, run (also, repls)
 ;;gist              ; interacting with github gists
@@ -383,7 +387,8 @@ make              ; run make tasks from Emacs
 ;;prodigy           ; FIXME managing external services & code builders
 ;;rgb               ; creating color strings
 taskrunner        ; taskrunner for all your projects
-terraform         ; infrastructure as code
+(terraform         ; infrastructure as code
+ +lsp)
 ;;tmux              ; an API for interacting with tmux
 tree-sitter       ; syntax and parsing, sitting in a tree...
 ;;upload            ; map local to remote projects via ssh/ftp
diff --git a/emacs/init.el b/emacs/init.el
index fb50391..bef71fd 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -17,9 +17,13 @@
 ;;      directory (for easy access to its source code).
 
 (doom! :completion
-       (company           ; the ultimate code completion backend
-        +childframe       ; not quite a window & not quite a frame
-       ; +tng              ; Use tab instead of ctrl+space
+       ;; (company           ; the ultimate code completion backend
+       ;;  +childframe       ; not quite a window & not quite a frame
+       ;; ; +tng              ; Use tab instead of ctrl+space
+       ;;  )
+       (corfu
+        +icons
+        +orderless
         )
        ;;helm              ; the *other* search engine for love and lifes
        ;;ido               ; the other *other* search engine...
@@ -96,7 +100,7 @@
        (debugger +lsp)         ; FIXME stepping through code, to help you add bugs
        ;;direnv
        ;;docker
-       ;;editorconfig      ; let someone else argue about tabs vs spaces
+       editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
@@ -112,7 +116,8 @@
        ;;prodigy           ; FIXME managing external services & code builders
        ;;rgb               ; creating color strings
        taskrunner        ; taskrunner for all your projects
-       terraform         ; infrastructure as code
+       (terraform         ; infrastructure as code
+        +lsp)
        ;;tmux              ; an API for interacting with tmux
        tree-sitter       ; syntax and parsing, sitting in a tree...
        ;;upload            ; map local to remote projects via ssh/ftp