Merge pull request #118 from yavko/overhaul-spell

docs/release-notes/rl-0.5.adoc

@@ -24,6 +24,8 @@ https://github.com/yavko[yavko]:
 
 * Added Deno Language Server for javascript/typescript
 
+* Added support for multiple languages <<opt-vim.spellChecking.languages>>, and added vim-dirtytalk <<opt-vim.spellChecking.enableProgrammingWordList>>
+
 https://github.com/notashelf[notashelf]:
 
 * Added GitHub Copilot to completion sources.

flake.lock

@@ -1491,6 +1491,7 @@
         "toggleterm-nvim": "toggleterm-nvim",
         "tokyonight": "tokyonight",
         "trouble": "trouble",
+        "vim-dirtytalk": "vim-dirtytalk",
         "vim-illuminate": "vim-illuminate",
         "vim-markdown": "vim-markdown",
         "vim-repeat": "vim-repeat",
@@ -1788,6 +1789,22 @@
         "type": "github"
       }
     },
+    "vim-dirtytalk": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1690722430,
+        "narHash": "sha256-kjyLwkAk6mqK7u4+zAr+Yh+zbSiukNKtXwb7t39LUco=",
+        "owner": "psliwka",
+        "repo": "vim-dirtytalk",
+        "rev": "a49251dce1852875951d95f7013979ece5caebf0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "psliwka",
+        "repo": "vim-dirtytalk",
+        "type": "github"
+      }
+    },
     "vim-illuminate": {
       "flake": false,
       "locked": {

flake.nix

@@ -456,6 +456,12 @@
       flake = false;
     };
 
+    # Spellchecking
+    vim-dirtytalk = {
+      url = "github:psliwka/vim-dirtytalk";
+      flake = false;
+    };
+
     # Terminal
     toggleterm-nvim = {
       url = "github:akinsho/toggleterm.nvim";

lib/types/plugins.nix

@@ -91,6 +91,7 @@ with lib; let
     "nvim-navbuddy"
     "copilot-cmp"
     "lsp-lines"
+    "vim-dirtytalk"
   ];
   # You can either use the name of the plugin or a package.
   pluginType = with types;

modules/basic/config.nix

@@ -8,7 +8,7 @@ with builtins; let
   cfg = config.vim;
 in {
   config = {
-    vim.startPlugins = ["plenary-nvim"];
+    vim.startPlugins = ["plenary-nvim"] ++ lib.optionals (cfg.spellChecking.enableProgrammingWordList) ["vim-dirtytalk"];
 
     vim.maps.normal =
       mkIf cfg.disableArrows {
@@ -140,7 +140,7 @@ in {
       ''}
       ${optionalString cfg.spellChecking.enable ''
         set spell
-        set spelllang=${toString cfg.spellChecking.language}
+        set spelllang=${builtins.concatStringsSep "," cfg.spellChecking.languages}${optionalString cfg.spellChecking.enableProgrammingWordList ",programming"}
       ''}
       ${optionalString (cfg.leaderKey != null) ''
         let mapleader = "${toString cfg.leaderKey}"

modules/basic/module.nix

@@ -31,11 +31,12 @@ with builtins; {
 
     spellChecking = {
       enable = mkEnableOption "neovim's built-in spellchecking";
-      language = mkOption {
+      enableProgrammingWordList = mkEnableOption "vim-dirtytalk, a wordlist for programmers, that includes programming words";
-        type = types.str;
+      languages = mkOption {
-        description = "The language to be used for spellchecking";
+        type = with types; listOf str;
-        default = "en_US";
+        description = "The languages to be used for spellchecking";
-        example = "de";
+        default = ["en"];
+        example = ["en" "de"];
       };
     };