From cc1d3db5f2a6f05ca68818dc2303dd85fc3db06d Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sun, 19 Feb 2023 23:34:25 +0300
Subject: 2023-02-19

---
 modules/common/emacs/default.nix  | 13 +++++++------
 modules/common/emacs/doom/init.el |  4 +---
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'modules/common/emacs')

diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index bdbbf43..bc4acdc 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -29,7 +29,7 @@ in {
               # by the project's flake/shell.
               extraBins = with pkgs;
                 [
-                  enchant # :checkers (spell +enchant)
+                  (aspellWithDicts (p: with p; [en ru])) # :checkers (spell +aspell)
                   (python3.withPackages (p:
                     with p; [
                       black # :lang python :editor format
@@ -61,6 +61,7 @@ in {
                   json-language-server # :lang (json +lsp)
                   nix-language-server # :lang (nix +lsp)
                   nixfmt # :lang nix :editor format
+                  nodePackages.eslint # :lang (json +lsp)
                   nodePackages.js-beautify # :lang web
                   nodePackages.prettier # :editor format
                   nodePackages.stylelint # :lang web
@@ -139,13 +140,13 @@ in {
           ];
           onChange = with config.hm.programs; ''
             if [[ -x "''${XDG_CONFIG_HOME:~/.config}/emacs/bin/doom" ]]; then
-               oldpath="$PATH"
-               export PATH="''${PATH:-/bin}:${emacs.package}/bin:${git.package}/bin"
+              oldpath="$PATH"
+              export PATH="''${PATH:-/bin}:${emacs.package}/bin:${git.package}/bin"
 
-               "''${XDG_CONFIG_HOME:~/.config}/emacs/bin/doom" sync
+              "''${XDG_CONFIG_HOME:~/.config}/emacs/bin/doom" sync
 
-               export PATH="$oldpath"
-               unset oldpath
+              export PATH="$oldpath"
+              unset oldpath
             fi
           '';
         };
diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el
index cdab069..764c25e 100644
--- a/modules/common/emacs/doom/init.el
+++ b/modules/common/emacs/doom/init.el
@@ -49,9 +49,7 @@
 
        :checkers
        syntax
-       (spell +enchant
-              +everywhere
-              +flyspell)
+       (spell +aspell +everywhere)
        grammar
 
        :tools
-- 
cgit v1.2.3