treewide: apply deadnix suggestions

This commit is contained in:
Austin Horstman 2024-12-14 11:32:01 -06:00
parent c7a261db2c
commit 95361fda3c
No known key found for this signature in database
7 changed files with 4 additions and 29 deletions

View file

@ -4,7 +4,7 @@
}: }:
let let
inherit (lib) types; inherit (lib) types;
inherit (lib.nixvim) defaultNullOpts mkRaw; inherit (lib.nixvim) defaultNullOpts;
in in
lib.nixvim.neovim-plugin.mkNeovimPlugin { lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "conform-nvim"; name = "conform-nvim";

View file

@ -3,9 +3,6 @@
... ...
}: }:
with lib; with lib;
let
inherit (lib.nixvim) mkRaw;
in
lib.nixvim.neovim-plugin.mkNeovimPlugin { lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "neotest"; name = "neotest";

View file

@ -168,9 +168,6 @@ in
let let
pluginToLua = pluginToLua =
plugin: plugin:
let
keyExists = keyToCheck: attrSet: lib.elem keyToCheck (lib.attrNames attrSet);
in
if isDerivation plugin then if isDerivation plugin then
{ dir = "${lazyPath}/${lib.getName plugin}"; } { dir = "${lazyPath}/${lib.getName plugin}"; }
else else

View file

@ -17,13 +17,11 @@
}: }:
let let
inherit (lib) inherit (lib)
isAttrs
listToAttrs listToAttrs
map map
mkIf mkIf
mkMerge mkMerge
mkOption mkOption
mkOptionType
optionalAttrs optionalAttrs
setAttrByPath setAttrByPath
; ;

View file

@ -4,16 +4,10 @@ self:
config, config,
lib, lib,
... ...
}@args: }:
let let
inherit (lib) inherit (lib)
mkEnableOption
mkOption
mkOptionType
mkForce
mkMerge
mkIf mkIf
types
; ;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
evalArgs = { evalArgs = {

View file

@ -4,15 +4,10 @@ self:
config, config,
lib, lib,
... ...
}@args: }:
let let
inherit (lib) inherit (lib)
mkEnableOption
mkOption
mkOptionType
mkMerge
mkIf mkIf
types
; ;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
evalArgs = { evalArgs = {

View file

@ -4,16 +4,10 @@ self:
config, config,
lib, lib,
... ...
}@args: }:
let let
inherit (lib) inherit (lib)
mkEnableOption
mkOption
mkOptionType
mkForce
mkMerge
mkIf mkIf
types
; ;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
evalArgs = { evalArgs = {