about summary refs log tree commit diff
path: root/modules/emacs/doom
diff options
context:
space:
mode:
Diffstat (limited to 'modules/emacs/doom')
-rw-r--r--modules/emacs/doom/config.el8
-rw-r--r--modules/emacs/doom/init.el21
-rw-r--r--modules/emacs/doom/packages.el10
3 files changed, 24 insertions, 15 deletions
diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el
index fe3b5b4..85fe4a9 100644
--- a/modules/emacs/doom/config.el
+++ b/modules/emacs/doom/config.el
@@ -33,12 +33,6 @@
        doom-modeline-height 30)
 
 ;;
-;;; TVL
-;;
-
-(use-package! tvl)
-
-;;
 ;;; Editorconfig
 ;;
 
@@ -87,7 +81,7 @@
 ;;; Org
 ;;
 
-(setq org-directory "~/doc/org/")
+(setq! org-directory "~/doc/org/")
 
 ;; For some reason only using `after!' work here. `setq-hook!' and etc doesn't
 ;; produce expected results.
diff --git a/modules/emacs/doom/init.el b/modules/emacs/doom/init.el
index b031880..8575c3f 100644
--- a/modules/emacs/doom/init.el
+++ b/modules/emacs/doom/init.el
@@ -2,10 +2,12 @@
        japanese
 
        :completion
-       company
+       ;; company
+       (corfu +icons +orderless +dabbrev)
        vertico
 
        :ui
+       deft
        doom
        (emoji +unicode)
        hl-todo
@@ -23,14 +25,19 @@
        (evil +everywhere)
        file-templates
        fold
-       format
+       (format +onsave)
+       lispy
+       ;; multiple-cursors
+       ;; objed
        parinfer
+       ;; rotate-text
        snippets
        word-wrap
 
        :emacs
        dired
        electric
+       eww
        ibuffer
        undo
        vc
@@ -41,7 +48,7 @@
 
        :checkers
        syntax
-       (spell +aspell +everywhere)
+       (spell +everywhere +icons)
        grammar
 
        :tools
@@ -57,12 +64,12 @@
        make
        (pass +auth)
        pdf
+       prodigy
        (terraform +lsp)
        tree-sitter
        upload
 
        :os
-       (:if (featurep :system 'macos) macos)
        tty
 
        :lang
@@ -70,6 +77,7 @@
        data
        emacs-lisp
        (go +lsp +tree-sitter)
+       (graphql +lsp +tree-sitter)
        (haskell +lsp +tree-sitter)
        javascript
        (json +lsp +tree-sitter)
@@ -78,8 +86,12 @@
        (nix +lsp +tree-sitter)
        (org +pandoc +roam2)
        plantuml
+       graphviz
        (python +poetry +pyright +lsp +tree-sitter)
+       ;; (racket +lsp +tree-sitter +xp +hash-lang)
+       rest
        (rust +lsp +tree-sitter)
+       ;; (scheme +chicken +guile +racket)
        (sh +lsp +tree-sitter)
        web
        (yaml +lsp +tree-sitter)
@@ -89,6 +101,7 @@
 
        :app
        calendar
+       emms
        irc
        (rss +org)
 
diff --git a/modules/emacs/doom/packages.el b/modules/emacs/doom/packages.el
index 0f908df..fb521bc 100644
--- a/modules/emacs/doom/packages.el
+++ b/modules/emacs/doom/packages.el
@@ -2,6 +2,8 @@
 
 (unpin! (:editor parinfer))
 
+(unpin! evil-collection)
+
 (package! xclip)
 
 (package! org-roam-ui)
@@ -19,7 +21,7 @@
   :recipe (:host gitlab
            :repo "emacs-ansible/emacs-ansible"))
 
-(package! tvl
-  :recipe (:host nil
-           :repo "https://code.tvl.fyi/depot.git:/tools/emacs-pkgs/tvl.git"
-           :build nil))
+;; (package! tvl
+;;   :recipe (:host nil
+;;            :repo "https://code.tvl.fyi/depot.git:/tools/emacs-pkgs/tvl.git"
+;;            :build nil))

Consider giving Nix/NixOS a try! <3