From 078d39656513dd908e1fea71f9541c79648a12d7 Mon Sep 17 00:00:00 2001
From: Tim McCarthy <thoomfish@gmail.com>
Date: Sun, 29 Sep 2024 23:48:06 -0700
Subject: [PATCH] Add jinx spellchecker

---
 nix/modules/emacs.nix | 14 +++++++++-----
 thoom-emacs/init.el   | 12 +++++++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/nix/modules/emacs.nix b/nix/modules/emacs.nix
index 38b700a..be58b47 100644
--- a/nix/modules/emacs.nix
+++ b/nix/modules/emacs.nix
@@ -2,14 +2,18 @@
 with config.lib.file;
 let dotdir = "${config.home.homeDirectory}/.dotfiles";
     isOnMac = pkgs.stdenv.hostPlatform.isDarwin;
+    emacsWithPackages = (pkgs.emacsPackagesFor pkgs.emacs29).emacsWithPackages;
 in
 {
-  programs.emacs.enable = true;
-  programs.emacs.package = pkgs.emacs;
-  programs.emacs.extraPackages = epkgs: [ epkgs.vterm ];
-
   home.packages = with pkgs; let
-    basePackages = [ zstd emacs-lsp-booster ];
+    basePackages = [
+      (emacsWithPackages (epkgs: [
+        epkgs.melpaPackages.jinx
+      ]))
+      zstd
+      emacs-lsp-booster
+      (aspellWithDicts (d: [d.en]))
+    ];
     macPackages = basePackages ++ [ coreutils ];
   in
     if isOnMac then macPackages else basePackages;
diff --git a/thoom-emacs/init.el b/thoom-emacs/init.el
index 854e026..412341d 100644
--- a/thoom-emacs/init.el
+++ b/thoom-emacs/init.el
@@ -245,13 +245,23 @@
   :bind (:map reveal-mode-map
               ([remap move-beginning-of-line] . mwim-beginning)
               ([remap move-end-of-line] . mwim-end)))
+;;;; Jinx
+
+(use-package jinx
+  :hook (emacs-startup . global-jinx-mode)
+  :bind (("M-$" . jinx-correct)
+         ("C-M-$" . jinx-languages)))
 
 ;;; Completion
 ;;;; Vertico
 (use-package vertico
   :ensure t
   :init
-  (vertico-mode))
+  (vertico-mode)
+  (vertico-multiform-mode 1)
+  (add-to-list 'vertico-multiform-categories
+               '(jinx grid (vertico-grid-annotate . 20))))
+
 
 (use-package vertico-directory
   :after vertico