user: fix jinx-mode missing dictionaries when launched from DE remove aspell, use nuspell/hunspell instead. They already know where to look for dictionaries.
Alan Pearce alan@alanpearce.eu
Sat, 18 May 2024 14:58:50 +0200
2 files changed, 18 insertions(+), 14 deletions(-)
M overlays/extra-packages.nix → overlays/extra-packages.nix
@@ -13,14 +13,17 @@ ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform} ''; }; }); - 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; + }; }
M user/settings/base.nix → user/settings/base.nix
@@ -29,7 +29,6 @@ MANPAGER = "bat -l man -p"; 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 @@ remake 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