Merge branch 'main' into spellcheck-restore-programming-wordlist

drop nil input, switch to pkgs.nil

docs/release-notes/rl-0.8.md

@@ -435,8 +435,7 @@
 [smart-splits.nvim]: https://github.com/mrjones2014/smart-splits.nvim
 
 - Add [solarized.nvim] theme with support for multiple variants
-
 - 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.
+- Fix lualine separator options

flake.lock

@@ -51,26 +51,6 @@
         "type": "github"
       }
     },
-    "nil": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750047244,
-        "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=",
-        "owner": "oxalica",
-        "repo": "nil",
-        "rev": "870a4b1b5f12004832206703ac15aa85c42c247b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "nil",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1750215678,
@@ -107,7 +87,6 @@
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "mnw": "mnw",
-        "nil": "nil",
         "nixpkgs": "nixpkgs",
         "systems": "systems_2"
       }

flake.nix

@@ -82,12 +82,5 @@
 
     # Alternate neovim-wrapper
     mnw.url = "github:Gerg-L/mnw";
-
-    ## Language servers (use master instead of nixpkgs)
-    # Nix LSP
-    nil = {
-      url = "github:oxalica/nil";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 }

flake/develop.nix

@@ -10,7 +10,7 @@
       default = self'.devShells.lsp;
       nvim-nix = pkgs.mkShellNoCC {packages = [config.packages.nix];};
       lsp = pkgs.mkShellNoCC {
-        packages = with pkgs; [inputs'.nil.packages.default statix deadnix alejandra npins];
+        packages = with pkgs; [nil statix deadnix alejandra npins];
       };
     };
 

lib/lua.nix

@@ -2,7 +2,7 @@
 {lib}: let
   inherit (builtins) hasAttr head throw typeOf isList isAttrs isBool isInt isString isPath isFloat toJSON;
   inherit (lib.attrsets) mapAttrsToList filterAttrs;
-  inherit (lib.strings) concatStringsSep concatMapStringsSep stringToCharacters concatLines;
+  inherit (lib.strings) concatStringsSep concatMapStringsSep stringToCharacters;
   inherit (lib.trivial) boolToString warn;
 in rec {
   # Convert a null value to lua's nil

lib/stdlib-extended.nix

@@ -1,10 +1,6 @@
 # Convenience function that returns the given Nixpkgs standard library
 # extended with our functions using `lib.extend`.
-{
+{inputs, ...} @ args:
-  inputs,
-  self,
-  ...
-} @ args:
 inputs.nixpkgs.lib.extend (self: super: {
   # WARNING: New functions should not be added here, but to files
   # imported by `./default.nix` under their own categories. If your

modules/neovim/init/clipboard.nix

@@ -6,7 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.options) mkOption mkEnableOption mkPackageOption;
-  inherit (lib.types) nullOr either str listOf submodule;
+  inherit (lib.types) str submodule;
   inherit (lib.attrsets) mapAttrs mapAttrsToList filterAttrs;
   cfg = config.vim.clipboard;
 in {

modules/neovim/init/diagnostics.nix

@@ -57,14 +57,21 @@
       signs = mkOption {
         type = diagnosticType;
         default = false;
-        example = {
+        example = literalExpression ''
-          signs.text = {
+          signs.text = lib.generators.mkLuaInline '''
-            "vim.diagnostic.severity.ERROR" = "󰅚 ";
+            {
-            "vim.diagnostic.severity.WARN" = "󰀪 ";
+              [vim.diagnostic.severity.ERROR] = "󰅚 ",
-          };
+              [vim.diagnostic.severity.WARN] = "󰀪 ",
-        };
+            }
+          ''';
+        '';
         description = ''
           Use signs for diagnostics. See {command}`:help diagnostic-signs`.
+
+          :::{.note}
+          The code presented in that example section uses Lua expressions as object keys which
+          only translate well if you use `lib.generators.mkLuaInline` as in the example.
+          :::
         '';
       };
 

modules/neovim/mappings/config.nix

@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.modules) mkMerge;
   inherit (lib.trivial) pipe;
   inherit (lib.attrsets) mapAttrsToList;
   inherit (lib.lists) flatten;

modules/plugins/assistant/copilot/config.nix

@@ -5,7 +5,6 @@
 }: let
   inherit (builtins) toJSON;
   inherit (lib.modules) mkIf;
-  inherit (lib.strings) optionalString;
 
   cfg = config.vim.assistant.copilot;
 

modules/plugins/completion/blink-cmp/blink-cmp.nix

@@ -1,7 +1,6 @@
 {lib, ...}: let
   inherit (lib.options) mkEnableOption mkOption literalMD;
   inherit (lib.types) bool listOf str either attrsOf submodule enum anything int nullOr;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.types) mkPluginSetupOption luaInline pluginType;
   inherit (lib.nvim.binds) mkMappingOption;
   inherit (lib.nvim.config) mkBool;

modules/plugins/completion/nvim-cmp/config.nix

@@ -3,11 +3,10 @@
   config,
   ...
 }: let
-  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.modules) mkIf;
   inherit (lib.strings) optionalString;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (builtins) attrNames typeOf tryEval concatStringsSep;
 
   borders = config.vim.ui.borders.plugins.nvim-cmp;

modules/plugins/completion/nvim-cmp/nvim-cmp.nix

@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption literalExpression literalMD;
+  inherit (lib.options) mkEnableOption mkOption literalMD;
   inherit (lib.types) str attrsOf nullOr either listOf;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.binds) mkMappingOption;

modules/plugins/dashboard/alpha/config.nix

@@ -4,7 +4,6 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
-  inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.dashboard.alpha;

modules/plugins/languages/astro.nix

@@ -10,7 +10,6 @@
   inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
   inherit (lib.types) enum either listOf package str;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
 

modules/plugins/languages/bash.nix

@@ -66,7 +66,7 @@ in {
 
       package = mkOption {
         description = "bash-language-server package, or the command to run as a list of strings";
-        example = literalExpression ''[lib.getExe pkgs.nodePackages.bash-language-server "start"]'';
+        example = literalExpression ''[lib.getExe pkgs.bash-language-server "start"]'';
         type = either package (listOf str);
         default = pkgs.bash-language-server;
       };

modules/plugins/languages/nim.nix

@@ -6,7 +6,6 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.types) enum either listOf package str;

modules/plugins/languages/nix.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  inputs,
   ...
 }: let
   inherit (builtins) attrNames;
@@ -28,7 +27,7 @@
     else ''{"${package}/bin/${defaultCmd}"}'';
   servers = {
     nil = {
-      package = inputs.nil.packages.${pkgs.stdenv.system}.nil;
+      package = pkgs.nil;
       internalFormatter = true;
       lspConfig = ''
         lspconfig.nil_ls.setup{

modules/plugins/languages/svelte.nix

@@ -9,7 +9,6 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.types) enum either listOf package str;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
@@ -19,7 +18,7 @@
   defaultServer = "svelte";
   servers = {
     svelte = {
-      package = pkgs.nodePackages.svelte-language-server;
+      package = pkgs.svelte-language-server;
       lspConfig = ''
         lspconfig.svelte.setup {
           capabilities = capabilities;

modules/plugins/languages/ts.nix

@@ -9,7 +9,6 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.types) enum either listOf package str bool;
   inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption;

modules/plugins/languages/yaml.nix

@@ -28,7 +28,7 @@
   defaultServer = "yaml-language-server";
   servers = {
     yaml-language-server = {
-      package = pkgs.nodePackages.yaml-language-server;
+      package = pkgs.yaml-language-server;
       lspConfig = ''
 
 

modules/plugins/mini/ai/ai.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/align/align.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/animate/animate.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/basics/basics.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/bracketed/bracketed.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/bufremove/bufremove.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/clue/clue.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/colors/colors.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
 in {
   options.vim.mini.colors = {

modules/plugins/mini/comment/comment.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/completion/completion.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/diff/diff.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/doc/doc.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/extra/extra.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
 in {
   options.vim.mini.extra = {

modules/plugins/mini/files/files.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/fuzzy/fuzzy.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/git/git.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/hipatterns/hipatterns.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/hues/hues.nix

@@ -1,10 +1,5 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.strings) hasPrefix;
   inherit (lib.nvim.types) mkPluginSetupOption;
   inherit (lib.nvim.types) hexColor;
 in {

modules/plugins/mini/icons/icons.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/jump/jump.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/jump2d/jump2d.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/map/map.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/misc/misc.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/move/move.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/operators/operators.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/pairs/pairs.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/pick/pick.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/sessions/sessions.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/snippets/snippets.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/splitjoin/splitjoin.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/starter/starter.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/statusline/statusline.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/surround/surround.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/tabline/tabline.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/test/test.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/trailspace/trailspace.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/mini/visits/visits.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/statusline/lualine/config.nix

@@ -63,8 +63,8 @@ in {
           options = {
             icons_enabled = mkDefault cfg.icons.enable;
             theme = mkDefault cfg.theme;
-            component_separators = mkDefault [cfg.componentSeparator.left cfg.componentSeparator.right];
+            component_separators = mkDefault cfg.componentSeparator;
-            section_separators = mkDefault [cfg.sectionSeparator.left cfg.sectionSeparator.right];
+            section_separators = mkDefault cfg.sectionSeparator;
             globalstatus = mkDefault cfg.globalStatus;
             refresh = mkDefault cfg.refresh;
             always_divide_middle = mkDefault cfg.alwaysDivideMiddle;

modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix

@@ -1,6 +1,6 @@
 {lib, ...}: let
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) enum str bool;
+  inherit (lib.types) enum str;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.types) mkPluginSetupOption luaInline;
 in {

modules/plugins/utility/motion/flash/config.nix

@@ -5,8 +5,6 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.binds) mkKeymap;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.utility.motion.flash-nvim;
 in {

modules/plugins/utility/smart-splits/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   options,
   lib,

modules/plugins/visuals/cinnamon-nvim/cinnamon-nvim.nix

@@ -1,7 +1,7 @@
 {lib, ...}: let
   inherit (lib.modules) mkRemovedOptionModule;
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) submodule attrs attrsOf;
+  inherit (lib.types) attrs;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   imports = [

modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.modules) mkRenamedOptionModule;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.types) nullOr attrsOf attrs enum;

modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {