2023-11-26

3 files changed, 42 insertions, 25 deletions

diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el
index 257a3ea..dee3d3d 100644
--- a/modules/common/emacs/doom/config.el
+++ b/modules/common/emacs/doom/config.el
@@ -33,6 +33,16 @@
       lsp-modeline-code-actions-enable nil)
 
 ;;
+;;; Go
+;;
+
+(setq lsp-go-analyses '((shadow . t)
+                        (unsedvariable . t)
+                        (unusedparams . t)
+                        (unusedwrite . t)
+                        (useany . t)))
+
+;;
 ;;; Org
 ;;
 
@@ -107,6 +117,13 @@
         org-roam-ui-open-on-start t))
 
 ;;
+;;; LaTeX
+;;
+
+(map! :map cdlatex-mode-map
+      :i "TAB" #'cdlatex-tab)
+
+;;
 ;;; PlantUML
 ;;
 
@@ -187,6 +204,18 @@
               '("libera" "oftc" "hackint" "rizon")))
 
 ;;
+;;; Fcitx
+;;
+
+(use-package! fcitx
+  :after evil
+  :config
+  (when (setq fcitx-remote-command
+              (or (executable-find "fcitx5-remote")
+                  (executable-find "fcitx-remote")))
+    (fcitx-evil-turn-on)))
+
+;;
 ;;; Hledger
 ;;
 
diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el
index f03971f..0a5a417 100644
--- a/modules/common/emacs/doom/init.el
+++ b/modules/common/emacs/doom/init.el
@@ -1,26 +1,20 @@
 (doom! :input
-       ;; japanese
+       japanese
 
        :completion
        company
        vertico
 
        :ui
-       ;; deft
        doom
-       ;; doom-dashboard
-       ;; doom-quit
        (emoji +unicode)
        hl-todo
-       hydra
        indent-guides
        ligatures
        modeline
-       ;; nav-flash
+       nav-flash
        ophints
        (popup +defaults)
-       ;; tabs
-       ;; unicode
        (vc-gutter +diff-hl +pretty)
        window-select
        workspaces
@@ -30,10 +24,7 @@
        file-templates
        fold
        format
-       ;; lispy
-       ;; multiple-cursors
        parinfer
-       ;; rotate-text
        snippets
        word-wrap
 
@@ -63,7 +54,7 @@
        gist
        (lookup +dictionary +offline)
        (lsp +peek)
-       (magit +forge)
+       magit
        make
        (pass +auth)
        pdf
@@ -76,27 +67,24 @@
 
        :lang
        (cc +lsp +tree-sitter)
-       (common-lisp +lsp +tree-sitter)
        data
-       (dhall +lsp +tree-sitter)
-       (emacs-lisp +lsp +tree-sitter)
+       dhall
+       emacs-lisp
        (go +lsp +tree-sitter)
        (haskell +lsp +tree-sitter)
        (java +lsp +tree-sitter)
        (javascript +lsp +tree-sitter)
        (json +lsp +tree-sitter)
-       (kotlin +lsp +tree-sitter)
-       (latex +lsp +tree-sittter)
-       (markdown +lsp +tree-sitter)
+       kotlin
+       (latex +latexmk +cdlatex +lsp)
+       markdown
        (nix +lsp +tree-sitter)
-       (org +pandoc +roam2)
+       (org +contacts +gnuplot +pandoc +pomodoro +roam2)
        plantuml
-       (python +lsp +tree-sitter)
-       (racket +lsp +tree-sitter)
+       (python +poetry +lsp +tree-sitter)
        (rust +lsp +tree-sitter)
-       (scheme +lsp +tree-sitter +racket)
        (sh +lsp +tree-sitter)
-       web
+       (web +lsp +tree-sitter)
        (yaml +lsp +tree-sitter)
        (zig +lsp +tree-sitter)
 
@@ -105,8 +93,6 @@
 
        :app
        calendar
-       ;; emms
-       ;; everywhere
        irc
        (rss +org)
 
diff --git a/modules/common/emacs/doom/packages.el b/modules/common/emacs/doom/packages.el
index 26a1d31..ba24eb8 100644
--- a/modules/common/emacs/doom/packages.el
+++ b/modules/common/emacs/doom/packages.el
@@ -10,3 +10,5 @@
            :branch "main"))
 
 (package! hledger-mode)
+
+(package! fcitx)