From a88092202ccfdb981c6aef3270bdef20e7530f5f Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Wed, 10 Jul 2024 14:02:06 +0300
Subject: 2024-07-10

---
 modules/emacs/default.nix    | 15 ++++++---------
 modules/emacs/doom/config.el |  3 +++
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'modules/emacs')

diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index b466b64..762c0a6 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -97,6 +97,7 @@ in
                       editorconfig-core-c # :tools editorconfig
                       fd # doom!
                       gcc # :lang cc
+                      gdb # :tools debugger
                       ghc # :lang haskell
                       gnuplot # :lang (org +gnuplot)
                       gnutar # :tools tree-sitter
@@ -128,9 +129,6 @@ in
                       nodePackages.js-beautify # :lang web
                       nodePackages.prettier # :editor format
                       nodePackages.stylelint # :lang web
-                      nodePackages.vscode-css-languageserver-bin # lang (web +lsp)
-                      nodePackages.vscode-html-languageserver-bin # lang (web +lsp)
-                      nodePackages.vscode-json-languageserver-bin # lang (json +lsp)
                       nodejs # :tools debugger
                       pandoc # :lang org markdown latex
                       pinentry-emacs # doom!
@@ -140,7 +138,7 @@ in
                       python3 # :lang python
                       python3Packages.black # :lang python :editor format
                       python3Packages.isort # :lang python :editor format
-                      python3Packages.nose # :lang python
+                      python3Packages.nose2 # :lang python
                       python3Packages.pyflakes # :lang python :editor format
                       python3Packages.pytest # :lang python
                       python3Packages.python-lsp-server # :lang python :editor format
@@ -156,12 +154,12 @@ in
                       texlab # lang (tex +lsp)
                       texlive.combined.scheme-full # :lang org tex
                       unzip # :tools debugger
+                      vscode-langservers-extracted # :lang (json +lsp) (web +lsp)
                       wordnet # :tools (lookup +dictionary +offline)
                       yaml-language-server # :lang (yaml +lsp)
                       zig # :lang zig :editor format
                       zls # :lang (zig +lsp)
                       zstd # :emacs undo
-                      gdb # :tools debugger
                     ];
                   in
                   ''
@@ -180,13 +178,11 @@ in
 
                     ;; :input japanese
                     (setq migemo-dictionary "${pkgs.cmigemo}/share/migemo/utf-8/migemo-dict"
-                          migemo-options '("--quiet" "--emacs")
-                          skk-large-jisyo "${pkgs.skk-dicts}/share/SKK-JISYO.L"
-                          skk-show-inline t)
+                          skk-large-jisyo "${pkgs.skk-dicts}/share/SKK-JISYO.L")
 
                     ;; :editor parinfer
                     (setq parinfer-rust-auto-download nil
-                          parinfer-rust-library "${pkgs.parinfer-rust}/lib/libparinfer_rust.so")
+                          parinfer-rust-library "${pkgs.parinfer-rust-emacs}/lib/libparinfer_rust.so")
 
                     ;; :lang (org +roam2) :email mu4e
                     (setq emacsql-sqlite-executable "${getExe pkgs.emacsql-sqlite}")
@@ -207,6 +203,7 @@ in
                   (setq doom-font "${monospace.name}-${toString sizes.terminal}"
                         doom-serif-font "${serif.name}-${toString sizes.terminal}"
                         doom-variable-pitch-font "${sansSerif.name}-${toString sizes.terminal}")
+                        doom-emoji-font "${emoji.name}-${toString sizes.terminal}"
                 '')
                 (
                   with config.hm.accounts.email;
diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el
index 9ab1e23..1926627 100644
--- a/modules/emacs/doom/config.el
+++ b/modules/emacs/doom/config.el
@@ -19,6 +19,9 @@
         xclip-mode t
         xclip-method 'wl-copy))
 
+(setq migemo-options '("--quiet" "--emacs")
+      skk-show-inline t)
+
 ;;
 ;;; Doom-specific
 ;;
-- 
cgit v1.2.3