From 4a876305f61dc88efd4564d8d4c3888d50666e20 Mon Sep 17 00:00:00 2001 From: poz Date: Mon, 21 Jul 2025 10:57:24 +0200 Subject: [PATCH] languages: clean up unused inherits --- modules/plugins/languages/asm.nix | 4 +--- modules/plugins/languages/astro.nix | 4 +--- modules/plugins/languages/bash.nix | 6 ++---- modules/plugins/languages/clojure.nix | 6 +----- modules/plugins/languages/dart.nix | 5 +---- modules/plugins/languages/elixir.nix | 4 +--- modules/plugins/languages/gleam.nix | 6 +----- modules/plugins/languages/haskell.nix | 7 +++---- modules/plugins/languages/hcl.nix | 2 +- modules/plugins/languages/helm.nix | 5 ++--- modules/plugins/languages/java.nix | 4 +--- modules/plugins/languages/julia.nix | 4 +--- modules/plugins/languages/kotlin.nix | 4 +--- modules/plugins/languages/lua.nix | 2 +- modules/plugins/languages/nim.nix | 2 +- modules/plugins/languages/nix.nix | 2 +- modules/plugins/languages/nu.nix | 4 +--- modules/plugins/languages/ocaml.nix | 2 +- modules/plugins/languages/odin.nix | 4 +--- modules/plugins/languages/php.nix | 4 +--- modules/plugins/languages/python.nix | 2 +- modules/plugins/languages/r.nix | 4 ++-- modules/plugins/languages/ruby.nix | 2 +- modules/plugins/languages/sql.nix | 2 +- modules/plugins/languages/svelte.nix | 2 +- modules/plugins/languages/tailwind.nix | 4 +--- modules/plugins/languages/terraform.nix | 4 +--- modules/plugins/languages/vala.nix | 4 +--- modules/plugins/languages/wgsl.nix | 4 +--- modules/plugins/languages/yaml.nix | 4 +--- modules/plugins/languages/zig.nix | 2 +- 31 files changed, 36 insertions(+), 79 deletions(-) diff --git a/modules/plugins/languages/asm.nix b/modules/plugins/languages/asm.nix index 2b1962b9..d21bf979 100644 --- a/modules/plugins/languages/asm.nix +++ b/modules/plugins/languages/asm.nix @@ -4,10 +4,8 @@ lib, ... }: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) package enum listOf; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.meta) getExe; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix index 395a3e3c..14adbd0a 100644 --- a/modules/plugins/languages/astro.nix +++ b/modules/plugins/languages/astro.nix @@ -7,10 +7,8 @@ inherit (builtins) attrNames; inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; - inherit (lib.lists) isList; inherit (lib.meta) getExe; - inherit (lib.types) enum either listOf package str; - inherit (lib.nvim.lua) expToLua; + inherit (lib.types) enum package; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.types) mkGrammarOption mkServersOption diagnostics; inherit (lib.generators) mkLuaInline; diff --git a/modules/plugins/languages/bash.nix b/modules/plugins/languages/bash.nix index f17f034b..33cf15bd 100644 --- a/modules/plugins/languages/bash.nix +++ b/modules/plugins/languages/bash.nix @@ -5,14 +5,12 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkOption mkEnableOption literalExpression; + inherit (lib.options) mkOption mkEnableOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - inherit (lib.lists) isList; - inherit (lib.types) enum either package listOf str bool; + inherit (lib.types) enum package bool; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.types) diagnostics mkGrammarOption mkServersOption; - inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.attrsets) mapListToAttrs; cfg = config.vim.languages.bash; diff --git a/modules/plugins/languages/clojure.nix b/modules/plugins/languages/clojure.nix index 1c06e18e..357592b8 100644 --- a/modules/plugins/languages/clojure.nix +++ b/modules/plugins/languages/clojure.nix @@ -4,14 +4,10 @@ lib, ... }: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.lists) isList; - inherit (lib.types) enum either listOf package str; inherit (lib.nvim.types) mkGrammarOption mkServersOption; - inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.attrsets) mapListToAttrs; cfg = config.vim.languages.clojure; diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix index 41a524f3..76043273 100644 --- a/modules/plugins/languages/dart.nix +++ b/modules/plugins/languages/dart.nix @@ -4,15 +4,12 @@ lib, ... }: let - inherit (builtins) attrNames; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.trivial) boolToString; - inherit (lib.lists) isList; inherit (lib.options) mkEnableOption mkOption; - inherit (lib.types) enum either listOf package nullOr str bool; + inherit (lib.types) package nullOr str bool; inherit (lib.strings) optionalString; - inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix index 5b77a3bf..2a94ee40 100644 --- a/modules/plugins/languages/elixir.nix +++ b/modules/plugins/languages/elixir.nix @@ -7,12 +7,10 @@ inherit (builtins) attrNames; inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; - inherit (lib.lists) isList; inherit (lib.meta) getExe; - inherit (lib.types) enum either listOf package str; + inherit (lib.types) enum package; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.types) mkGrammarOption mkServersOption; - inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/gleam.nix b/modules/plugins/languages/gleam.nix index 37c3cca4..d2dd8a8d 100644 --- a/modules/plugins/languages/gleam.nix +++ b/modules/plugins/languages/gleam.nix @@ -4,13 +4,9 @@ lib, ... }: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; - inherit (lib.lists) isList; inherit (lib.meta) getExe; - inherit (lib.types) enum either listOf package str; - inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix index 8d77bf5c..695cb2af 100644 --- a/modules/plugins/languages/haskell.nix +++ b/modules/plugins/languages/haskell.nix @@ -4,17 +4,16 @@ pkgs, ... }: let - inherit (builtins) isList attrNames; - inherit (lib.types) either package enum listOf str; + inherit (builtins) isList; + inherit (lib.types) either package listOf str; inherit (lib.options) mkEnableOption mkOption; inherit (lib.strings) optionalString; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption mkServersOption; - inherit (lib.nvim.dag) entryAfter entryBefore; + inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.lua) expToLua; inherit (lib.meta) getExe'; inherit (lib.generators) mkLuaInline; - inherit (lib.nvim.attrsets) mapListToAttrs; inherit (pkgs) haskellPackages; inherit (lib.nvim.lua) toLuaObject; diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix index 03f10c8e..b88a0c43 100644 --- a/modules/plugins/languages/hcl.nix +++ b/modules/plugins/languages/hcl.nix @@ -8,7 +8,7 @@ inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) package bool enum listOf; + inherit (lib.types) package bool enum; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/helm.nix b/modules/plugins/languages/helm.nix index 15c15eea..e192ddc8 100644 --- a/modules/plugins/languages/helm.nix +++ b/modules/plugins/languages/helm.nix @@ -4,11 +4,10 @@ lib, ... }: let - inherit (builtins) attrNames head; - inherit (lib.options) mkEnableOption mkOption; + inherit (builtins) head; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.types) enum listOf; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/java.nix b/modules/plugins/languages/java.nix index 2510f3b0..c8f8bc9d 100644 --- a/modules/plugins/languages/java.nix +++ b/modules/plugins/languages/java.nix @@ -4,11 +4,9 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (builtins) attrNames; - inherit (lib.types) listOf enum; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.dag) entryBefore; diff --git a/modules/plugins/languages/julia.nix b/modules/plugins/languages/julia.nix index e57c1d39..ff2e8143 100644 --- a/modules/plugins/languages/julia.nix +++ b/modules/plugins/languages/julia.nix @@ -4,9 +4,7 @@ config, ... }: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; - inherit (lib.types) listOf enum; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.nvim.types) mkGrammarOption mkServersOption; diff --git a/modules/plugins/languages/kotlin.nix b/modules/plugins/languages/kotlin.nix index 8744d512..8afbe5bf 100644 --- a/modules/plugins/languages/kotlin.nix +++ b/modules/plugins/languages/kotlin.nix @@ -4,11 +4,9 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe' getExe; - inherit (builtins) attrNames; - inherit (lib.types) enum listOf; inherit (lib.nvim.types) mkGrammarOption mkServersOption diagnostics; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/lua.nix b/modules/plugins/languages/lua.nix index 2b0a213f..c4ca8dd5 100644 --- a/modules/plugins/languages/lua.nix +++ b/modules/plugins/languages/lua.nix @@ -8,7 +8,7 @@ inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.types) bool enum listOf package; + inherit (lib.types) bool enum package; inherit (lib.nvim.types) diagnostics mkGrammarOption mkServersOption; inherit (lib.nvim.dag) entryBefore; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/nim.nix b/modules/plugins/languages/nim.nix index 00567442..a7b35e39 100644 --- a/modules/plugins/languages/nim.nix +++ b/modules/plugins/languages/nim.nix @@ -8,7 +8,7 @@ inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe'; inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) enum listOf package; + inherit (lib.types) enum package; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix index 4506b41f..7388751e 100644 --- a/modules/plugins/languages/nix.nix +++ b/modules/plugins/languages/nix.nix @@ -9,7 +9,7 @@ inherit (lib.meta) getExe; inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) enum package listOf; + inherit (lib.types) enum package; inherit (lib.nvim.types) mkGrammarOption mkServersOption diagnostics; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/nu.nix b/modules/plugins/languages/nu.nix index 9695d648..f338e90a 100644 --- a/modules/plugins/languages/nu.nix +++ b/modules/plugins/languages/nu.nix @@ -4,14 +4,12 @@ config, ... }: let - inherit (lib.options) mkEnableOption mkOption; - inherit (lib.types) enum listOf; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.meta) getExe; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.attrsets) mapListToAttrs; - inherit (builtins) attrNames; defaultServers = ["nushell"]; servers = { diff --git a/modules/plugins/languages/ocaml.nix b/modules/plugins/languages/ocaml.nix index 1b60de0b..91c18d00 100644 --- a/modules/plugins/languages/ocaml.nix +++ b/modules/plugins/languages/ocaml.nix @@ -8,7 +8,7 @@ inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.types) enum listOf package; + inherit (lib.types) enum package; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/odin.nix b/modules/plugins/languages/odin.nix index 6d34728d..90be52b8 100644 --- a/modules/plugins/languages/odin.nix +++ b/modules/plugins/languages/odin.nix @@ -4,10 +4,8 @@ lib, ... }: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) listOf enum; inherit (lib.meta) getExe; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.generators) mkLuaInline; diff --git a/modules/plugins/languages/php.nix b/modules/plugins/languages/php.nix index be29c94d..1bbdf4e4 100644 --- a/modules/plugins/languages/php.nix +++ b/modules/plugins/languages/php.nix @@ -4,11 +4,9 @@ lib, ... }: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) enum listOf; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.generators) mkLuaInline; diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix index 809794e9..6463bab8 100644 --- a/modules/plugins/languages/python.nix +++ b/modules/plugins/languages/python.nix @@ -8,7 +8,7 @@ inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) enum listOf package str bool; + inherit (lib.types) enum package bool; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.dag) entryBefore; diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix index 18e5d5bf..cdf950c1 100644 --- a/modules/plugins/languages/r.nix +++ b/modules/plugins/languages/r.nix @@ -5,9 +5,9 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) enum listOf package; + inherit (lib.types) enum package; inherit (lib.meta) getExe; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/ruby.nix b/modules/plugins/languages/ruby.nix index 46218307..69746aa7 100644 --- a/modules/plugins/languages/ruby.nix +++ b/modules/plugins/languages/ruby.nix @@ -9,7 +9,7 @@ inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption mkServersOption diagnostics; - inherit (lib.types) listOf package enum; + inherit (lib.types) package enum; inherit (lib.nvim.attrsets) mapListToAttrs; cfg = config.vim.languages.ruby; diff --git a/modules/plugins/languages/sql.nix b/modules/plugins/languages/sql.nix index f108a894..4408cd3a 100644 --- a/modules/plugins/languages/sql.nix +++ b/modules/plugins/languages/sql.nix @@ -8,7 +8,7 @@ inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) enum listOf package str; + inherit (lib.types) enum package str; inherit (lib.nvim.types) diagnostics mkGrammarOption mkServersOption; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.generators) mkLuaInline; diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix index 3c209b4f..b5f5adff 100644 --- a/modules/plugins/languages/svelte.nix +++ b/modules/plugins/languages/svelte.nix @@ -8,7 +8,7 @@ inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.types) enum listOf package; + inherit (lib.types) enum package; inherit (lib.nvim.types) mkGrammarOption mkServersOption diagnostics; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.generators) mkLuaInline; diff --git a/modules/plugins/languages/tailwind.nix b/modules/plugins/languages/tailwind.nix index eec0a6ec..6600087d 100644 --- a/modules/plugins/languages/tailwind.nix +++ b/modules/plugins/languages/tailwind.nix @@ -4,11 +4,9 @@ lib, ... }: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.types) enum listOf; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.types) mkServersOption; diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix index 14e9f49a..c57f5daf 100644 --- a/modules/plugins/languages/terraform.nix +++ b/modules/plugins/languages/terraform.nix @@ -4,11 +4,9 @@ lib, ... }: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.types) enum listOf; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/vala.nix b/modules/plugins/languages/vala.nix index f4445375..6699639f 100644 --- a/modules/plugins/languages/vala.nix +++ b/modules/plugins/languages/vala.nix @@ -4,11 +4,9 @@ lib, ... }: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.types) enum listOf; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.generators) mkLuaInline; diff --git a/modules/plugins/languages/wgsl.nix b/modules/plugins/languages/wgsl.nix index ddcd4c70..2ddaee3e 100644 --- a/modules/plugins/languages/wgsl.nix +++ b/modules/plugins/languages/wgsl.nix @@ -4,11 +4,9 @@ pkgs, ... }: let - inherit (builtins) attrNames; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption mkServersOption; - inherit (lib.options) mkEnableOption mkOption; - inherit (lib.types) enum listOf; + inherit (lib.options) mkEnableOption; inherit (lib.meta) getExe; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix index 2ed2b59f..5e43b93b 100644 --- a/modules/plugins/languages/yaml.nix +++ b/modules/plugins/languages/yaml.nix @@ -4,11 +4,9 @@ lib, ... }: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.types) enum listOf; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.nvim.attrsets) mapListToAttrs; diff --git a/modules/plugins/languages/zig.nix b/modules/plugins/languages/zig.nix index 1b28c7b8..5376652c 100644 --- a/modules/plugins/languages/zig.nix +++ b/modules/plugins/languages/zig.nix @@ -7,7 +7,7 @@ inherit (builtins) attrNames; inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge mkDefault; - inherit (lib.types) bool listOf package enum; + inherit (lib.types) bool package enum; inherit (lib.nvim.types) mkGrammarOption mkServersOption; inherit (lib.meta) getExe; inherit (lib.nvim.attrsets) mapListToAttrs;