From 045f098f0e2b8ca28300b76059d8b785ac00f0ac Mon Sep 17 00:00:00 2001
From: Laszlo Bacsi <lackac@lackac.hu>
Date: Sat, 5 Jul 2025 18:48:20 +0200
Subject: [PATCH] spellcheck: restore configuration for vim-dirtytalk

---
 configuration.nix                                   | 1 +
 docs/release-notes/rl-0.8.md                        | 1 +
 modules/modules.nix                                 | 2 +-
 modules/neovim/init/spellcheck.nix                  | 2 ++
 modules/plugins/spellcheck/vim-dirtytalk/config.nix | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 6f26f040..060362ca 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -15,6 +15,7 @@ isMaximal: {
 
     spellcheck = {
       enable = true;
+      programmingWordlist.enable = isMaximal;
     };
 
     lsp = {
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index c01bc043..1213c9e5 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -439,3 +439,4 @@
 - Add [smart-splits.nvim] for navigating between Neovim windows and terminal multiplexer panes.
   Available at `vim.utility.smart-splits`.
 
+- Restore vim-dirtytalk plugin and fix ordering with spellcheck in generated config.
diff --git a/modules/modules.nix b/modules/modules.nix
index 97bfa211..1eca042a 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -38,7 +38,7 @@
       "runner"
       "session"
       "snippets"
-      # "spellcheck" # FIXME: see neovim/init/spellcheck.nix
+      "spellcheck"
       "statusline"
       "tabline"
       "terminal"
diff --git a/modules/neovim/init/spellcheck.nix b/modules/neovim/init/spellcheck.nix
index fb0f86ea..5c593a65 100644
--- a/modules/neovim/init/spellcheck.nix
+++ b/modules/neovim/init/spellcheck.nix
@@ -94,6 +94,8 @@ in {
       Enabling this option will unconditionally set
       {option}`vim.spellcheck.enable` to true as vim-dirtytalk
       depends on spellchecking having been set up.
+
+      Run {command}`:DirtytalkUpdate` on first use to download the spellfile.
       :::
     '';
   };
diff --git a/modules/plugins/spellcheck/vim-dirtytalk/config.nix b/modules/plugins/spellcheck/vim-dirtytalk/config.nix
index 51ccfb81..7fd32d61 100644
--- a/modules/plugins/spellcheck/vim-dirtytalk/config.nix
+++ b/modules/plugins/spellcheck/vim-dirtytalk/config.nix
@@ -17,7 +17,7 @@ in {
       # like to append programming to spelllangs as soon as
       # possible while the plugin is enabled and the state
       # directory can be found.
-      pluginRC.vim-dirtytalk = entryAfter ["spellcheck"] ''
+      luaConfigRC.vim-dirtytalk = entryAfter ["spellcheck"] ''
         -- If Neovim can find (or access) the state directory
         -- then append "programming" wordlist from vim-dirtytalk
         -- to spelllang table. If path cannot be found, display