Merge pull request #992 from imnotpoz/main

minor treewide improvements
2025-09-10 04:11:34 +00:00 · 2025-07-07 13:33:24 +03:00 · 2025-07-07 13:33:24 +03:00 · 2acbfd810f
commit 2acbfd810f
parent 8413b25e5e 47735a6be6
58 changed files with 50 additions and 222 deletions
--- a/lib/lua.nix
+++ b/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
--- a/lib/stdlib-extended.nix
+++ b/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,
-  self,
-  ...
-} @ args:
+{inputs, ...} @ 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
--- a/modules/neovim/init/clipboard.nix
+++ b/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 {
--- a/modules/neovim/mappings/config.nix
+++ b/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;
--- a/modules/plugins/assistant/copilot/config.nix
+++ b/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;

--- a/modules/plugins/completion/blink-cmp/blink-cmp.nix
+++ b/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;
--- a/modules/plugins/completion/nvim-cmp/config.nix
+++ b/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;
--- a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
+++ b/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;
--- a/modules/plugins/dashboard/alpha/config.nix
+++ b/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;
--- a/modules/plugins/languages/astro.nix
+++ b/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;

--- a/modules/plugins/languages/bash.nix
+++ b/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;
      };
--- a/modules/plugins/languages/nim.nix
+++ b/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;
--- a/modules/plugins/languages/svelte.nix
+++ b/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;
--- a/modules/plugins/languages/ts.nix
+++ b/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;
--- a/modules/plugins/languages/yaml.nix
+++ b/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 = ''


--- a/modules/plugins/mini/ai/ai.nix
+++ b/modules/plugins/mini/ai/ai.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/align/align.nix
+++ b/modules/plugins/mini/align/align.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/animate/animate.nix
+++ b/modules/plugins/mini/animate/animate.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/basics/basics.nix
+++ b/modules/plugins/mini/basics/basics.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/bracketed/bracketed.nix
+++ b/modules/plugins/mini/bracketed/bracketed.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/bufremove/bufremove.nix
+++ b/modules/plugins/mini/bufremove/bufremove.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/clue/clue.nix
+++ b/modules/plugins/mini/clue/clue.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/colors/colors.nix
+++ b/modules/plugins/mini/colors/colors.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
 in {
  options.vim.mini.colors = {
--- a/modules/plugins/mini/comment/comment.nix
+++ b/modules/plugins/mini/comment/comment.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/completion/completion.nix
+++ b/modules/plugins/mini/completion/completion.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/diff/diff.nix
+++ b/modules/plugins/mini/diff/diff.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/doc/doc.nix
+++ b/modules/plugins/mini/doc/doc.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/extra/extra.nix
+++ b/modules/plugins/mini/extra/extra.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
 in {
  options.vim.mini.extra = {
--- a/modules/plugins/mini/files/files.nix
+++ b/modules/plugins/mini/files/files.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/fuzzy/fuzzy.nix
+++ b/modules/plugins/mini/fuzzy/fuzzy.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/git/git.nix
+++ b/modules/plugins/mini/git/git.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/hipatterns/hipatterns.nix
+++ b/modules/plugins/mini/hipatterns/hipatterns.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/hues/hues.nix
+++ b/modules/plugins/mini/hues/hues.nix
@ -1,10 +1,5 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.strings) hasPrefix;
  inherit (lib.nvim.types) mkPluginSetupOption;
  inherit (lib.nvim.types) hexColor;
 in {
--- a/modules/plugins/mini/icons/icons.nix
+++ b/modules/plugins/mini/icons/icons.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/jump/jump.nix
+++ b/modules/plugins/mini/jump/jump.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/jump2d/jump2d.nix
+++ b/modules/plugins/mini/jump2d/jump2d.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/map/map.nix
+++ b/modules/plugins/mini/map/map.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/misc/misc.nix
+++ b/modules/plugins/mini/misc/misc.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/move/move.nix
+++ b/modules/plugins/mini/move/move.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/operators/operators.nix
+++ b/modules/plugins/mini/operators/operators.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/pairs/pairs.nix
+++ b/modules/plugins/mini/pairs/pairs.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/pick/pick.nix
+++ b/modules/plugins/mini/pick/pick.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/sessions/sessions.nix
+++ b/modules/plugins/mini/sessions/sessions.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/snippets/snippets.nix
+++ b/modules/plugins/mini/snippets/snippets.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/splitjoin/splitjoin.nix
+++ b/modules/plugins/mini/splitjoin/splitjoin.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/starter/starter.nix
+++ b/modules/plugins/mini/starter/starter.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/statusline/statusline.nix
+++ b/modules/plugins/mini/statusline/statusline.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/surround/surround.nix
+++ b/modules/plugins/mini/surround/surround.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/tabline/tabline.nix
+++ b/modules/plugins/mini/tabline/tabline.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/test/test.nix
+++ b/modules/plugins/mini/test/test.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/trailspace/trailspace.nix
+++ b/modules/plugins/mini/trailspace/trailspace.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/mini/visits/visits.nix
+++ b/modules/plugins/mini/visits/visits.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
--- a/modules/plugins/utility/leetcode-nvim/leetcode-nvim.nix
+++ b/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 {
--- a/modules/plugins/utility/motion/flash/config.nix
+++ b/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 {
--- a/modules/plugins/utility/smart-splits/config.nix
+++ b/modules/plugins/utility/smart-splits/config.nix
@ -1,5 +1,4 @@
 {
-  pkgs,
  config,
  options,
  lib,
--- a/modules/plugins/visuals/cinnamon-nvim/cinnamon-nvim.nix
+++ b/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 = [
--- a/modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix
+++ b/modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.modules) mkRenamedOptionModule;
  inherit (lib.options) mkOption mkEnableOption literalExpression;
  inherit (lib.types) nullOr attrsOf attrs enum;
--- a/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix
+++ b/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix
@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  inherit (lib.options) mkEnableOption;
  inherit (lib.nvim.types) mkPluginSetupOption;
 in {