diff --git a/emacs/.config/doom/init.el b/emacs/.config/doom/init.el
index 00f9e32..bdfa6d8 100644
--- a/emacs/.config/doom/init.el
+++ b/emacs/.config/doom/init.el
@@ -6,10 +6,12 @@
        ;;japanese
 
        :completion
-       company ; the ultimate code completion backend
-       (ivy +icons +fuzzy)                ; a search engine for love and life
-       ;;helm              ; the *other* search engine for love and life
-       ;;ido               ; the other *other* search engine...
+       company           ; the ultimate code completion backend
+       (ivy              ; a search engine for love and life
+        +icons
+        +fuzzy)
+       ;;helm            ; the *other* search engine for love and life
+       ;;ido             ; the other *other* search engine...
 
        :ui
        deft              ; notational velocity for Emacs
@@ -47,10 +49,14 @@
        ;;parinfer          ; turn lisp into python, sort of
        rotate-text       ; cycle region at point between text candidates
        snippets          ; my elves. They type so I don't have to
+       ;;word-wrap       ; soft wrapping with language-aware indent
 
        :emacs
-       (dired +ranger +icons)
+       (dired
+        +ranger
+        +icons)
        electric          ; smarter, keyword-based electric-indent
+       ibuffer           ; interactive buffer management
        vc                ; version-control and Emacs, sitting in a tree
 
        :term
@@ -64,9 +70,9 @@
        debugger          ; FIXME stepping through code, to help you add bugs
        direnv
        docker
-       ;;editorconfig      ; let someone else argue about tabs vs spaces
-       ;;ein               ; tame Jupyter notebooks with emacs
-       eval              ; run code, run (also, repls)
+       editorconfig      ; let someone else argue about tabs vs spaces
+       ;;ein             ; tame Jupyter notebooks with emacs
+       (eval +overlay)   ; run code, run (also, repls)
        flycheck          ; tasing you for every semicolon you forget
        flyspell          ; tasing you for misspelling mispelling
        gist              ; interacting with github gists
@@ -92,22 +98,22 @@
        ;;clojure           ; java with a lisp
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
-       crystal           ; ruby at the speed of c
+       crystal             ; ruby at the speed of c
        ;;csharp            ; unity, .NET, and mono shenanigans
-       data              ; config/data formats
+       data                ; config/data formats
        ;;erlang            ; an elegant language for a more civilized age
-       (elixir)            ; erlang done right
-       elm               ; care for a cup of TEA?
-       emacs-lisp        ; drown in parentheses
+       elixir              ; erlang done right
+       elm                 ; care for a cup of TEA?
+       emacs-lisp          ; drown in parentheses
        ;;ess               ; emacs speaks statistics
-       ;;fsharp           ; ML stands for Microsoft's Language
-       (go)                ; the hipster dialect
+       ;;fsharp            ; ML stands for Microsoft's Language
+       go                  ; the hipster dialect
        ;;(haskell +intero) ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ;
        ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
-       (javascript)        ; all(hope(abandon(ye(who(enter(here))))))
-       julia             ; a better, faster MATLAB
+       javascript          ; all(hope(abandon(ye(who(enter(here))))))
+       julia               ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        ;;latex             ; writing papers in Emacs has never been so fun
        ;;ledger            ; an accounting system in Emacs
@@ -116,22 +122,25 @@
        nim                 ; python + lisp at the speed of c
        ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
-       (org              ; organize your plain life in plain text
-        +dragndrop       ; file drag & drop support
+       (org                ; organize your plain life in plain text
+        +dragndrop         ; file drag & drop support
+        +hugo
         +gnuplot
-        +ipython         ; ipython support for babel
-        +pandoc          ; pandoc integration into org's exporter
-        +present)        ; using Emacs for presentations
+        +ipython           ; ipython support for babel
+        +journal
+        +pandoc            ; pandoc integration into org's exporter
+        +pomodoro
+        +present)          ; using Emacs for presentations
        ;;perl              ; write code no one else can comprehend
        ;;php               ; perl's insecure younger brother
-       plantuml          ; diagrams for confusing people more
+       plantuml            ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       (python)       ; beautiful is better than ugly
+       python              ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
-       racket            ; a DSL for DSLs
-       rest              ; Emacs as a REST client
-       (ruby)         ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       (rust)         ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       racket              ; a DSL for DSLs
+       rest                ; Emacs as a REST client
+       ruby                ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       rust                ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        scheme            ; a fully conniving family of lisps
        (sh +fish)          ; she sells (ba|z|fi)sh shells on the C xor
diff --git a/emacs/.config/doom/packages.el b/emacs/.config/doom/packages.el
index 96f0b3e..ef5f15d 100644
--- a/emacs/.config/doom/packages.el
+++ b/emacs/.config/doom/packages.el
@@ -31,10 +31,7 @@
 (package! wttrin)
 
 ;; org stuffs
-(package! org-journal)
-(package! ox-hugo)
 (package! ob-http)
-(package! org-gcal)
 (package! org-web-tools)
 (package! org-vcard)
 (package! org-snooze)