From 0650aa31acfd0a6903522494d4d66c91c05af9c4 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 3 Dec 2024 00:40:28 +0300
Subject: [PATCH 1/9] modules/neovim: deprecate `vim.enableEditorconfig` option

Deprecate shorthand EditorConfig toggle, and encourage the more powerful `vim.globals` option.
---
 docs/release-notes/rl-0.7.md   | 13 ++++++++-----
 modules/extra/deprecations.nix |  5 ++++-
 modules/neovim/init/basic.nix  | 10 ----------
 modules/wrapper/rc/options.nix | 15 +++++++++++++++
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md
index 59267ddf..fd3764ac 100644
--- a/docs/release-notes/rl-0.7.md
+++ b/docs/release-notes/rl-0.7.md
@@ -28,11 +28,11 @@ configuration formats.
 
 ### `vim.maps` rewrite {#sec-vim-maps-rewrite}
 
-Instead of specifying map modes using submodules (eg.: `vim.maps.normal`), a new
-`vim.keymaps` submodule with support for a `mode` option has been introduced. It
-can be either a string, or a list of strings, where a string represents the
-short-name of the map mode(s), that the mapping should be set for. See
-`:help map-modes` for more information.
+Instead of specifying map modes using submodules (e.g.: `vim.maps.normal`), a
+new `vim.keymaps` submodule with support for a `mode` option has been
+introduced. It can be either a string, or a list of strings, where a string
+represents the short-name of the map mode(s), that the mapping should be set
+for. See `:help map-modes` for more information.
 
 For example:
 
@@ -334,6 +334,9 @@ The changes are, in no particular order:
   `vim.options` as default values. Some are left as they don't have a direct
   equivalent, but expect a switch eventually.
 
+- Deprecated `vim.enableEditorconfig` in favor of
+  [](#opt-vim.globals.editorconfig).
+
 [ppenguin](https://github.com/ppenguin):
 
 - Telescope:
diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index e4cb193f..9fd52938 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -84,9 +84,12 @@ in {
         `tabstop` and `shiftwidth` manually in `vim.options` or per-filetype in a
         `ftplugin` directory added to your runtime path.
       '')
+
+      # 2024-12-02
+      (mkRenamedOptionModule ["vim" "enableEditorconfig"] ["vim" "globals" "editorconfig"])
     ]
 
-    # 2024-12-1
+    # 2024-12-01
     # Migrated via batchRenameOptions. Further batch renames must be below this line.
     renamedVimOpts
   ];
diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index 9370fa8f..1b45feaa 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -70,12 +70,6 @@ in {
       description = "Set how bells are handled. Options: on, visual or none";
     };
 
-    enableEditorconfig = mkOption {
-      type = bool;
-      default = true;
-      description = "Follow editorconfig rules in current directory";
-    };
-
     searchCase = mkOption {
       type = enum ["ignore" "smart" "sensitive"];
       default = "sensitive";
@@ -112,10 +106,6 @@ in {
       expandtab = true;
     };
 
-    globals = pushDownDefault {
-      editorconfig = cfg.enableEditorconfig;
-    };
-
     # Options that are more difficult to set through 'vim.options'. Fear not, though
     # as the Lua DAG is still as powerful as it could be.
     luaConfigRC.basic = entryAfter ["globalsScript"] ''
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index ab541419..fc9938ba 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -121,6 +121,21 @@ in {
             default = ",";
             description = "The key used for `<localleader>` mappings";
           };
+
+          editorconfig = mkOption {
+            type = bool;
+            default = true;
+            description = ''
+              Whether to enable EditorConfig integration in Neovim.
+
+              This defaults to true as it is enabled by default in stock
+              Neovim, setting this option to false disables EditorConfig
+              integration entirely.
+
+              See [Neovim documentation](https://neovim.io/doc/user/editorconfig.html)
+              for more details on configuring EditorConfig behaviour.
+            '';
+          };
         };
       };
 

From 5a5f49f85f1d667c78e731592c93084176683ae0 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 3 Dec 2024 00:52:08 +0300
Subject: [PATCH 2/9] lib/languages: re-add `toVimBool`

---
 lib/languages.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/languages.nix b/lib/languages.nix
index 52f1b5b8..56c225d6 100644
--- a/lib/languages.nix
+++ b/lib/languages.nix
@@ -6,7 +6,12 @@
   inherit (lib.nvim.attrsets) mapListToAttrs;
 in {
   # Converts a boolean to a yes/no string. This is used in lots of
-  # configuration formats.
+  # configuration formats, and is not covered by `toLuaObject`
+  toVimBool = bool:
+    if bool
+    then "yes"
+    else "no";
+
   diagnosticsToLua = {
     lang,
     config,
@@ -30,8 +35,8 @@ in {
 
   mkEnable = desc:
     mkOption {
-      description = "Turn on ${desc} for enabled languages by default";
-      type = bool;
       default = false;
+      type = bool;
+      description = "Turn on ${desc} for enabled languages by default";
     };
 }

From 07f50e84eb99d2454250b1076449a8667f19b4de Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 3 Dec 2024 00:53:22 +0300
Subject: [PATCH 3/9] modules/neovim: deprecate `vim.showSignColumn`

Prefer the type-safe `vim.options` equivalent.
---
 modules/extra/deprecations.nix |  6 +++++
 modules/neovim/init/basic.nix  | 40 +++++++++++++---------------------
 modules/wrapper/rc/options.nix |  8 +++++++
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index 9fd52938..8d27d7ac 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -14,6 +14,7 @@
     splitRight = "splitright";
     autoIndent = "autoindent";
     wordWrap = "wrap";
+    showSignColumn = "signcolumn";
   };
 in {
   imports = concatLists [
@@ -35,23 +36,28 @@ in {
         vim.autopairs.enable has been removed in favor of per-plugin modules.
         You can enable nvim-autopairs with vim.autopairs.nvim-autopairs.enable instead.
       '')
+
       (mkRemovedOptionModule ["vim" "autopairs" "type"] ''
         vim.autopairs.type has been removed in favor of per-plugin modules.
         You can enable nvim-autopairs with vim.autopairs.nvim-autopairs.enable instead.
       '')
+
       (mkRemovedOptionModule ["vim" "autocomplete" "enable"] ''
         vim.autocomplete.enable has been removed in favor of per-plugin modules.
         You can enable nvim-cmp with vim.autocomplete.nvim-cmp.enable instead.
       '')
+
       (mkRemovedOptionModule ["vim" "autocomplete" "type"] ''
         vim.autocomplete.type has been removed in favor of per-plugin modules.
         You can enable nvim-cmp with vim.autocomplete.nvim-cmp.enable instead.
       '')
+
       (mkRemovedOptionModule ["vim" "autocomplete" "sources"] ''
         vim.autocomplete.sources has been removed in favor of per-plugin modules.
         You can add nvim-cmp sources with vim.autocomplete.nvim-cmp.sources
         instead.
       '')
+
       (mkRemovedOptionModule ["vim" "snippets" "vsnip" "enable"] ''
         vim.snippets.vsnip.enable has been removed in favor of the more modern luasnip.
       '')
diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index 1b45feaa..ef899cf4 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -58,12 +58,6 @@ in {
       description = "Prevent swapfile and backupfile from being created";
     };
 
-    showSignColumn = mkOption {
-      type = bool;
-      default = true;
-      description = "Show the sign column";
-    };
-
     bell = mkOption {
       type = enum ["none" "visual" "on"];
       default = "none";
@@ -109,74 +103,70 @@ in {
     # Options that are more difficult to set through 'vim.options'. Fear not, though
     # as the Lua DAG is still as powerful as it could be.
     luaConfigRC.basic = entryAfter ["globalsScript"] ''
-      -- Settings that are set for everything
-      vim.opt.shortmess:append("c")
+       -- Settings that are set for everything
+       vim.opt.shortmess:append("c")
 
-      ${optionalString cfg.undoFile.enable ''
+       ${optionalString cfg.undoFile.enable ''
         vim.o.undofile = true
         vim.o.undodir = ${toLuaObject cfg.undoFile.path}
       ''}
 
-      ${optionalString cfg.showSignColumn ''
-        vim.o.signcolumn = "yes"
-      ''}
-
       ${optionalString cfg.preventJunkFiles ''
         vim.o.swapfile = false
         vim.o.backup = false
         vim.o.writebackup = false
       ''}
 
-      ${optionalString (cfg.bell == "none") ''
+       ${optionalString (cfg.bell == "none") ''
         vim.o.errorbells = false
         vim.o.visualbell = false
       ''}
 
-      ${optionalString (cfg.bell == "on") ''
+       ${optionalString (cfg.bell == "on") ''
         vim.o.visualbell = false
       ''}
 
-      ${optionalString (cfg.bell == "visual") ''
+       ${optionalString (cfg.bell == "visual") ''
         vim.o.errorbells = false
       ''}
 
-      ${optionalString (cfg.lineNumberMode == "relative") ''
+       ${optionalString (cfg.lineNumberMode == "relative") ''
         vim.o.relativenumber = true
       ''}
 
-      ${optionalString (cfg.lineNumberMode == "number") ''
+       ${optionalString (cfg.lineNumberMode == "number") ''
         vim.o.number = true
       ''}
 
-      ${optionalString (cfg.lineNumberMode == "relNumber") ''
+       ${optionalString (cfg.lineNumberMode == "relNumber") ''
         vim.o.number = true
         vim.o.relativenumber = true
       ''}
 
-      ${optionalString cfg.useSystemClipboard ''
+       ${optionalString cfg.useSystemClipboard ''
         vim.opt.clipboard:append("unnamedplus")
       ''}
 
-      ${optionalString cfg.syntaxHighlighting ''
+       ${optionalString cfg.syntaxHighlighting ''
         vim.cmd("syntax on")
       ''}
 
-      ${optionalString cfg.hideSearchHighlight ''
+       ${optionalString cfg.hideSearchHighlight ''
         vim.o.hlsearch = false
         vim.o.incsearch = true
       ''}
 
-      ${optionalString (cfg.searchCase == "ignore") ''
+       ${optionalString (cfg.searchCase == "ignore") ''
         vim.o.smartcase = false
         vim.o.ignorecase = true
       ''}
 
-      ${optionalString (cfg.searchCase == "smart") ''
+       ${optionalString (cfg.searchCase == "smart") ''
         vim.o.smartcase = true
         vim.o.ignorecase = true
       ''}
 
-      ${optionalString (cfg.searchCase == "sensitive") ''
+       ${optionalString (cfg.searchCase == "sensitive") ''
         vim.o.smartcase = false
         vim.o.ignorecase = false
       ''}
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index fc9938ba..1a7ea8b1 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -6,6 +6,7 @@
   inherit (lib.options) mkOption mkEnableOption literalMD literalExpression;
   inherit (lib.strings) optionalString;
   inherit (lib.types) str bool int enum attrsOf lines listOf either path submodule anything;
+  inherit (lib.nvim.languages) toVimBool;
   inherit (lib.nvim.types) dagOf;
   inherit (lib.nvim.lua) listToLuaTable;
 
@@ -227,6 +228,13 @@ in {
             default = true;
             description = "Enable word wrapping.";
           };
+
+          signcolumn = mkOption {
+            type = bool;
+            default = true;
+            apply = x: toVimBool x; # convert to a yes/no str
+            description = "Show the sign column";
+          };
         };
       };
 

From c19c925f1dd8d86e82f6fe78ca2e42ff8883bcb1 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 3 Dec 2024 01:03:45 +0300
Subject: [PATCH 4/9] modules/neovim: avoid interpolating strings for
 `vim.preventJunkFiles`

---
 modules/neovim/init/basic.nix | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index ef899cf4..f91ea9a1 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -95,78 +95,78 @@ in {
     # and 'vim.globals' (vim.g). Future options, if possible, should be added here instead of the
     # luaConfigRC section below.
     options = pushDownDefault {
+      # Options that are always set, with a lower priority
       encoding = "utf-8";
       hidden = true;
       expandtab = true;
+
+      # Junkfile Behaviour
+      swapfile = !cfg.preventJunkFiles;
+      backup = !cfg.preventJunkFiles;
+      writebackup = !cfg.preventJunkFiles;
     };
 
     # Options that are more difficult to set through 'vim.options'. Fear not, though
     # as the Lua DAG is still as powerful as it could be.
     luaConfigRC.basic = entryAfter ["globalsScript"] ''
-       -- Settings that are set for everything
-       vim.opt.shortmess:append("c")
+      -- Settings that are set for everything
+      vim.opt.shortmess:append("c")
 
-       ${optionalString cfg.undoFile.enable ''
+      ${optionalString cfg.undoFile.enable ''
         vim.o.undofile = true
         vim.o.undodir = ${toLuaObject cfg.undoFile.path}
       ''}
 
-      ${optionalString cfg.preventJunkFiles ''
-        vim.o.swapfile = false
-        vim.o.backup = false
-        vim.o.writebackup = false
-      ''}
-
-       ${optionalString (cfg.bell == "none") ''
+      ${optionalString (cfg.bell == "none") ''
         vim.o.errorbells = false
         vim.o.visualbell = false
       ''}
 
-       ${optionalString (cfg.bell == "on") ''
+      ${optionalString (cfg.bell == "on") ''
         vim.o.visualbell = false
       ''}
 
-       ${optionalString (cfg.bell == "visual") ''
+      ${optionalString (cfg.bell == "visual") ''
         vim.o.errorbells = false
       ''}
 
-       ${optionalString (cfg.lineNumberMode == "relative") ''
+      ${optionalString (cfg.lineNumberMode == "relative") ''
         vim.o.relativenumber = true
       ''}
 
-       ${optionalString (cfg.lineNumberMode == "number") ''
+      ${optionalString (cfg.lineNumberMode == "number") ''
         vim.o.number = true
       ''}
 
-       ${optionalString (cfg.lineNumberMode == "relNumber") ''
+      ${optionalString (cfg.lineNumberMode == "relNumber") ''
         vim.o.number = true
         vim.o.relativenumber = true
       ''}
 
-       ${optionalString cfg.useSystemClipboard ''
+      ${optionalString cfg.useSystemClipboard ''
         vim.opt.clipboard:append("unnamedplus")
       ''}
 
-       ${optionalString cfg.syntaxHighlighting ''
+      ${optionalString cfg.syntaxHighlighting ''
         vim.cmd("syntax on")
       ''}
 
-       ${optionalString cfg.hideSearchHighlight ''
+      ${optionalString cfg.hideSearchHighlight ''
         vim.o.hlsearch = false
         vim.o.incsearch = true
       ''}
 
-       ${optionalString (cfg.searchCase == "ignore") ''
+      ${optionalString (cfg.searchCase == "ignore") ''
         vim.o.smartcase = false
         vim.o.ignorecase = true
       ''}
 
-       ${optionalString (cfg.searchCase == "smart") ''
+      ${optionalString (cfg.searchCase == "smart") ''
         vim.o.smartcase = true
         vim.o.ignorecase = true
       ''}
 
-       ${optionalString (cfg.searchCase == "sensitive") ''
+      ${optionalString (cfg.searchCase == "sensitive") ''
         vim.o.smartcase = false
         vim.o.ignorecase = false
       ''}

From 66005a51c380cc8ca3597b1e092cb343d900ad93 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 11 Dec 2024 00:08:48 +0300
Subject: [PATCH 5/9] wrappr/rc: allow strings in `vim.options.signcolumn`

---
 modules/wrapper/rc/options.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 1a7ea8b1..980c9497 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -6,6 +6,7 @@
   inherit (lib.options) mkOption mkEnableOption literalMD literalExpression;
   inherit (lib.strings) optionalString;
   inherit (lib.types) str bool int enum attrsOf lines listOf either path submodule anything;
+  inherit (lib.trivial) isBool;
   inherit (lib.nvim.languages) toVimBool;
   inherit (lib.nvim.types) dagOf;
   inherit (lib.nvim.lua) listToLuaTable;
@@ -230,9 +231,12 @@ in {
           };
 
           signcolumn = mkOption {
-            type = bool;
+            type = either str bool;
             default = true;
-            apply = x: toVimBool x; # convert to a yes/no str
+            apply = x:
+              if isBool x
+              then toVimBool x # convert to a yes/no str
+              else x;
             description = "Show the sign column";
           };
         };

From b67759273b2c2066e39f45f734a6b84c1a14ebe6 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 4 Jan 2025 15:52:27 +0300
Subject: [PATCH 6/9] neovim/spellcheck: convert to `vim.options`

---
 modules/neovim/init/spellcheck.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/neovim/init/spellcheck.nix b/modules/neovim/init/spellcheck.nix
index 5d6f5bed..f8d784da 100644
--- a/modules/neovim/init/spellcheck.nix
+++ b/modules/neovim/init/spellcheck.nix
@@ -124,7 +124,6 @@ in {
               nvim --headless --clean \
                 --cmd "mkspell $out/spell/$name.add.spl $spellfile" -Es -n
             done
-
           '';
       in
         mkIf (cfg.extraSpellWords != {}) [
@@ -133,10 +132,12 @@ in {
           compileJoinedSpellfiles.outPath
         ];
 
-      luaConfigRC.spellcheck = entryAfter ["basic"] ''
-        vim.opt.spell = true
-        vim.opt.spelllang = ${listToLuaTable cfg.languages}
+      options = {
+        spell = true;
+        spelllang = cfg.languages;
+      };
 
+      luaConfigRC.spellcheck = entryAfter ["basic"] ''
         -- Disable spellchecking for certain filetypes
         -- as configured by `vim.spellcheck.ignoredFiletypes`
         vim.api.nvim_create_augroup("nvf_autocmds", {clear = false})

From 85347de09d6eaa03989a98885781f9c8fd31830b Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 4 Jan 2025 16:08:11 +0300
Subject: [PATCH 7/9] utility/gesture-nvim: convert to `vim.options`

---
 .../utility/gestures/gesture-nvim/config.nix  | 74 ++++++++++---------
 .../utility/gestures/gesture-nvim/default.nix |  2 +-
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/modules/plugins/utility/gestures/gesture-nvim/config.nix b/modules/plugins/utility/gestures/gesture-nvim/config.nix
index 2996f7d2..9838c178 100644
--- a/modules/plugins/utility/gestures/gesture-nvim/config.nix
+++ b/modules/plugins/utility/gestures/gesture-nvim/config.nix
@@ -15,43 +15,47 @@
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
-    vim.startPlugins = ["gesture-nvim"];
+    vim = {
+      startPlugins = ["gesture-nvim"];
 
-    vim.maps.normal = mkMerge [
-      (mkSetLuaBinding mappings.draw "require('gesture').draw")
-      (mkSetLuaBinding mappings.finish "require('gesture').finish")
-      (mkIf (mappings.draw.value == "<RightDrag>") {
-        "<RightMouse>" = {action = "<Nop>";};
-      })
-    ];
+      maps.normal = mkMerge [
+        (mkSetLuaBinding mappings.draw "require('gesture').draw")
+        (mkSetLuaBinding mappings.finish "require('gesture').finish")
+        (mkIf (mappings.draw.value == "<RightDrag>") {
+          "<RightMouse>" = {action = "<Nop>";};
+        })
+      ];
 
-    vim.pluginRC.gesture-nvim = entryAnywhere ''
-      vim.opt.mouse = "a"
+      options.mouse = "a";
+      pluginRC.gesture-nvim = entryAnywhere ''
+        local gesture = require("gesture")
+        gesture.register({
+          name = "scroll to bottom",
+          inputs = { gesture.up(), gesture.down() },
+          action = "normal! G",
+        })
 
-      local gesture = require("gesture")
-      gesture.register({
-        name = "scroll to bottom",
-        inputs = { gesture.up(), gesture.down() },
-        action = "normal! G",
-      })
-      gesture.register({
-        name = "next tab",
-        inputs = { gesture.right() },
-        action = "tabnext",
-      })
-      gesture.register({
-        name = "previous tab",
-        inputs = { gesture.left() },
-        action = function(ctx) -- also can use callable
-          vim.cmd.tabprevious()
-        end,
-      })
-      gesture.register({
-        name = "go back",
-        inputs = { gesture.right(), gesture.left() },
-        -- map to `<C-o>` keycode
-        action = [[lua vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<C-o>", true, false, true), "n", true)]],
-      })
-    '';
+        gesture.register({
+          name = "next tab",
+          inputs = { gesture.right() },
+          action = "tabnext",
+        })
+
+        gesture.register({
+          name = "previous tab",
+          inputs = { gesture.left() },
+          action = function(ctx) -- also can use callable
+            vim.cmd.tabprevious()
+          end,
+        })
+
+        gesture.register({
+          name = "go back",
+          inputs = { gesture.right(), gesture.left() },
+          -- map to `<C-o>` keycode
+          action = [[lua vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<C-o>", true, false, true), "n", true)]],
+        })
+      '';
+    };
   };
 }
diff --git a/modules/plugins/utility/gestures/gesture-nvim/default.nix b/modules/plugins/utility/gestures/gesture-nvim/default.nix
index 27e7e09f..4c7987e7 100644
--- a/modules/plugins/utility/gestures/gesture-nvim/default.nix
+++ b/modules/plugins/utility/gestures/gesture-nvim/default.nix
@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./gesture-nvim.nix
     ./config.nix

From 5749739e4b67c955f06efca03a9962bc55038dfc Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 4 Jan 2025 16:08:53 +0300
Subject: [PATCH 8/9] wrapper/rc: clean up option documentation

---
 modules/wrapper/rc/options.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 980c9497..20eb50e7 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkOption mkEnableOption literalMD literalExpression;
+  inherit (lib.options) mkOption literalMD literalExpression;
   inherit (lib.strings) optionalString;
   inherit (lib.types) str bool int enum attrsOf lines listOf either path submodule anything;
   inherit (lib.trivial) isBool;
@@ -19,7 +19,7 @@ in {
       default = false;
       example = true;
       description = ''
-        [{option}`official documentation`]: https://neovim.io/doc/user/lua.html#vim.loader.enable()
+        [official documentation]: https://neovim.io/doc/user/lua.html#vim.loader.enable()
 
         the experimental Lua module loader to speed up the start up process
 
@@ -31,7 +31,7 @@ in {
 
         ::: {.note}
         The Lua module loader is *disabled* by default. Before setting this option, please
-        take a look at the [{option}`official documentation`]. This option may be enabled by
+        take a look at the {option}`[official documentation]`. This option may be enabled by
         default in the future.
         :::
       '';
@@ -83,7 +83,7 @@ in {
           ./nvim/my-lua-file.lua
 
           # source type path - pure and reproducible
-          (builtins.source {
+          (builtins.path {
             path = ./nvim/my-lua-file.lua;
             name = "my-lua-file";
           })
@@ -274,7 +274,11 @@ in {
           vim.opt.runtimepath:append(${listToLuaTable cfg.additionalRuntimePaths})
         ''}
 
-        ${optionalString cfg.enableLuaLoader "vim.loader.enable()"}
+        ${optionalString cfg.enableLuaLoader ''
+          if vim.loader then
+            vim.loader.enable()
+          end
+        ''}
       '';
 
       defaultText = literalMD ''
@@ -284,7 +288,7 @@ in {
         if [](#opt-vim.enableLuaLoader) is set to true.
       '';
 
-      example = literalExpression ''"$${builtins.readFile ./my-lua-config-pre.lua}"'';
+      example = literalExpression ''''${builtins.readFile ./my-lua-config-pre.lua}'';
 
       description = ''
         Verbatim lua code that will be inserted **before**

From 356f92053c9a23adaef66092d3d6e1d48923a9a8 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 7 Jan 2025 06:12:13 +0300
Subject: [PATCH 9/9] neovim/init: merge conditionals in options set

---
 modules/neovim/init/basic.nix  | 93 +++++++++++++++++-----------------
 modules/wrapper/rc/options.nix |  3 +-
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index f91ea9a1..532ebcea 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -5,6 +5,7 @@
 }: let
   inherit (lib.options) mkOption mkEnableOption literalMD;
   inherit (lib.strings) optionalString;
+  inherit (lib.attrsets) optionalAttrs;
   inherit (lib.types) enum bool str int either;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryAfter;
@@ -94,55 +95,55 @@ in {
     # Set options that were previously interpolated in 'luaConfigRC.basic' as vim.options (vim.o)
     # and 'vim.globals' (vim.g). Future options, if possible, should be added here instead of the
     # luaConfigRC section below.
-    options = pushDownDefault {
-      # Options that are always set, with a lower priority
-      encoding = "utf-8";
-      hidden = true;
-      expandtab = true;
+    options = pushDownDefault (lib.mergeAttrsList [
+      {
+        # Options that are always set, with a lower priority
+        encoding = "utf-8";
+        hidden = true;
+        expandtab = true;
 
-      # Junkfile Behaviour
-      swapfile = !cfg.preventJunkFiles;
-      backup = !cfg.preventJunkFiles;
-      writebackup = !cfg.preventJunkFiles;
-    };
+        # Junkfile Behaviour
+        swapfile = !cfg.preventJunkFiles;
+        backup = !cfg.preventJunkFiles;
+        writebackup = !cfg.preventJunkFiles;
+      }
 
-    # Options that are more difficult to set through 'vim.options'. Fear not, though
-    # as the Lua DAG is still as powerful as it could be.
+      (optionalAttrs cfg.undoFile.enable {
+        undofile = true;
+        undodir = cfg.undoFile.path;
+      })
+
+      (optionalAttrs (cfg.bell == "none") {
+        errorbells = false;
+        visualbell = false;
+      })
+
+      (optionalAttrs (cfg.bell == "on") {
+        visualbell = false;
+      })
+
+      (optionalAttrs (cfg.bell == "visual") {
+        visualbell = false;
+      })
+
+      (optionalAttrs (cfg.lineNumberMode == "relative") {
+        relativenumber = true;
+      })
+
+      (optionalAttrs (cfg.lineNumberMode == "number") {
+        number = true;
+      })
+
+      (optionalAttrs (cfg.lineNumberMode == "relNumber") {
+        number = true;
+        relativenumber = true;
+      })
+    ]);
+
+    # Options that are more difficult to set through 'vim.options'. Namely, appending values
+    # to pre-set Neovim options. Fear not, though as the Lua DAG is still as powerful as it
+    # could be.
     luaConfigRC.basic = entryAfter ["globalsScript"] ''
-      -- Settings that are set for everything
-      vim.opt.shortmess:append("c")
-
-      ${optionalString cfg.undoFile.enable ''
-        vim.o.undofile = true
-        vim.o.undodir = ${toLuaObject cfg.undoFile.path}
-      ''}
-
-      ${optionalString (cfg.bell == "none") ''
-        vim.o.errorbells = false
-        vim.o.visualbell = false
-      ''}
-
-      ${optionalString (cfg.bell == "on") ''
-        vim.o.visualbell = false
-      ''}
-
-      ${optionalString (cfg.bell == "visual") ''
-        vim.o.errorbells = false
-      ''}
-
-      ${optionalString (cfg.lineNumberMode == "relative") ''
-        vim.o.relativenumber = true
-      ''}
-
-      ${optionalString (cfg.lineNumberMode == "number") ''
-        vim.o.number = true
-      ''}
-
-      ${optionalString (cfg.lineNumberMode == "relNumber") ''
-        vim.o.number = true
-        vim.o.relativenumber = true
-      ''}
-
       ${optionalString cfg.useSystemClipboard ''
         vim.opt.clipboard:append("unnamedplus")
       ''}
diff --git a/modules/wrapper/rc/options.nix b/modules/wrapper/rc/options.nix
index 8fff005d..d82fc741 100644
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@@ -235,7 +235,8 @@ in {
               if isBool x
               then toVimBool x # convert to a yes/no str
               else x;
-            description = "Show the sign column"
+            description = "Show the sign column";
+          };
 
           tabstop = mkOption {
             type = int;