doom

3 files changed, 14 insertions, 11 deletions

diff --git a/doom.d/config.el b/doom.d/config.el
index 0d87289..59bde36 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -54,4 +54,7 @@
 (after! smartparens
   (smartparens-global-mode -1))
 
-(load-file ".doom.d/config.local.el")
+(after! mu4e-maildirs-extension
+  (mu4e-maildirs-extension))
+
+(load-file "~/.doom.d/config.local.el")
diff --git a/doom.d/init.el b/doom.d/init.el
index 25cb70d..137404a 100644
--- a/doom.d/init.el
+++ b/doom.d/init.el
@@ -13,6 +13,7 @@
 ;;
 ;;      Alternatively, press 'gd' (or 'C-c g d') on a module to browse its
 ;;      directory (for easy access to its source code).
+(load-file "~/.doom.d/init.local.el")
 
 (doom! :input
        ;;chinese
@@ -53,10 +54,10 @@
        (evil +everywhere); come to the dark side, we have cookies
        file-templates    ; auto-snippets for empty files
        fold              ; (nigh) universal code folding
-       ;;(format +onsave)  ; automated prettiness
+       (format +onsave)  ; automated prettiness
        ;;god               ; run Emacs commands without modifier keys
        ;;lispy             ; vim for lisp, for people who don't like vim
-       ;;multiple-cursors  ; editing in many places at once
+       multiple-cursors  ; editing in many places at once
        ;;objed             ; text object editing for the innocent
        ;;parinfer          ; turn lisp into python, sort of
        ;;rotate-text       ; cycle region at point between text candidates
@@ -112,7 +113,7 @@
        ;;coq               ; proofs-as-programs
        ;;crystal           ; ruby at the speed of c
        ;;csharp            ; unity, .NET, and mono shenanigans
-       ;;data              ; config/data formats
+       data              ; config/data formats
        ;;(dart +flutter)   ; paint ui and not much else
        ;;elixir            ; erlang done right
        ;;elm               ; care for a cup of TEA?
@@ -140,18 +141,18 @@
        ;;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
+       (org +journal +roam)               ; organize your plain life in plain text
        ;;perl              ; write code no one else can comprehend
        ;;php               ; perl's insecure younger brother
        ;;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
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor
@@ -159,11 +160,11 @@
        ;;solidity          ; do you need a blockchain? No.
        ;;swift             ; who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
-       ;;web               ; the tubes
+       web               ; the tubes
        ;;yaml              ; JSON, but readable
 
        :email
-       (mu4e +gmail)
+       mu4e
        ;;notmuch
        ;;(wanderlust +gmail)
 
@@ -177,4 +178,3 @@
        ;;literate
        (default +bindings +smartparens))
 
-(load-file ".doom.d/init.local.el")
diff --git a/doom.d/packages.el b/doom.d/packages.el
index eb1d7df..adb100f 100644
--- a/doom.d/packages.el
+++ b/doom.d/packages.el
@@ -46,4 +46,4 @@
 ;; our package manager can't deal with; see raxod502/straight.el#279)
 ;(package! builtin-package :recipe (:branch "develop"))
 
-(load-file ".doom.d/packages.local.el")
+(load-file "~/.doom.d/packages.local.el")