From b2ad0c7cb46cc809614ecaa45b1413f225309e54 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 18 May 2024 14:58:50 +0200
Subject: user: fix jinx-mode missing dictionaries when launched from DE

remove aspell, use nuspell/hunspell instead. They already know where
to look for dictionaries.
---
 overlays/extra-packages.nix | 23 +++++++++++++----------
 user/settings/base.nix      |  9 +++++----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/overlays/extra-packages.nix b/overlays/extra-packages.nix
index 0e0451d0..0bc408bf 100644
--- a/overlays/extra-packages.nix
+++ b/overlays/extra-packages.nix
@@ -13,14 +13,17 @@ self: super: {
         '';
       };
   });
-  enchant = super.enchant.overrideAttrs (old: {
-    configureFlags = old.configureFlags ++ [ "--without-hspell" ]
-      # builtins.filter (c: c != "--with-hspell") old.configureFlags
-      ++ self.lib.optional super.stdenv.isDarwin "--with-applespell"
-    ;
-    buildInputs =
-      builtins.filter (c: c.name != "hspell") old.buildInputs
-      ++ self.lib.optionals super.stdenv.isDarwin (with super.darwin.apple_sdk.frameworks; [ Cocoa ]);
-    propagatedBuildInputs = builtins.filter (c: c.name != "hspell") old.propagatedBuildInputs;
-  });
+  enchant =
+    let
+      file = builtins.fetchurl {
+        url = "https://raw.githubusercontent.com/alanpearce/nixpkgs/7ee75d6aa9b088922b47b69c1912b2afe000ae52/pkgs/development/libraries/enchant/2.x.nix";
+        sha256 = "1y7h3fvp7ghcfb5v3h6riiv7z2bzgnxm0p696bbhfb0gwwv9q8aw";
+      };
+    in
+    super.callPackage file {
+      withHspell = false;
+      withAspell = false;
+
+      inherit (super.darwin.apple_sdk.frameworks) Cocoa;
+    };
 }
diff --git a/user/settings/base.nix b/user/settings/base.nix
index d0c01b87..05ad7089 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -29,7 +29,6 @@ args@{ config
       ABDUCO_SOCKET_DIR = "${state}/abduco";
       GNUPGHOME = "${data}/gnupg";
       SOLARGRAPH_CACHE = "${cache}/solargraph";
-      ASPELL_CONF = "per-conf ${conf}/aspell/aspell.conf; personal ${conf}/aspell/en.pws; repl ${conf}/aspell/en.prepl; dict-dir ${config.home.profileDirectory}/lib/aspell";
       ELECTRUMDIR = "${data}/electrum";
       DOCKER_CONFIG = "${conf}/docker";
       npm_config_userconfig = "${conf}/npm/config";
@@ -102,9 +101,11 @@ args@{ config
       abduco
       dvtm
       walk
-      (aspellWithDicts (d: [ d.en d.en-computers d.en-science d.de ]))
-    ]
-    ++ (
+      nuspell
+    ] ++ (with pkgs.hunspellDicts; [
+      en-gb-large
+      de-de
+    ]) ++ (
       if !stdenv.isDarwin
       then [
         file
-- 
cgit 1.4.1