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/curl.nix             |  3 +--
 modules/common/emacs/default.nix    | 13 +++++++------
 modules/common/emacs/doom/init.el   |  4 +---
 modules/common/git.nix              |  1 -
 modules/common/profiles/headful.nix |  1 -
 modules/common/vscode.nix           |  2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'modules/common')

diff --git a/modules/common/curl.nix b/modules/common/curl.nix
index e7bee31..a48b93e 100644
--- a/modules/common/curl.nix
+++ b/modules/common/curl.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.curl;
 in {
-  options.nixfiles.modules.curl.enable =
-    mkEnableOption "Wether to enable cURL.";
+  options.nixfiles.modules.curl.enable = mkEnableOption "cURL.";
 
   config = mkIf cfg.enable {
     hm.home.file.".curlrc".text = ''
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
diff --git a/modules/common/git.nix b/modules/common/git.nix
index 2c1dd1f..2a0554f 100644
--- a/modules/common/git.nix
+++ b/modules/common/git.nix
@@ -80,7 +80,6 @@ in {
             ".DS_Store"
             ".cache/clangd/"
             ".ccls-cache/"
-            ".dir-locals.el"
             ".gdb_history"
             ".netrwhist"
             ".projectile"
diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix
index eec14c5..1c1f43b 100644
--- a/modules/common/profiles/headful.nix
+++ b/modules/common/profiles/headful.nix
@@ -95,7 +95,6 @@ in {
     };
 
     environment.systemPackages = with pkgs; [
-      (aspellWithDicts (p: with p; [en ru]))
       arping
       dnsutils
       inetutils
diff --git a/modules/common/vscode.nix b/modules/common/vscode.nix
index 92ce5b5..2d34788 100644
--- a/modules/common/vscode.nix
+++ b/modules/common/vscode.nix
@@ -110,7 +110,7 @@ in {
           external.linuxExec =
             if alacritty.enable
             then "${pkgs.alacritty}/bin/alacritty"
-            else "${pkgs.xterm}/bin/xterm}";
+            else "${pkgs.xterm}/bin/xterm";
 
           integrated = {
             inherit fontFamily fontSize;
-- 
cgit v1.2.3