From 95361fda3c020f64f9331aaa09e76c2dcb662ac0 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 14 Dec 2024 11:32:01 -0600
Subject: [PATCH] treewide: apply deadnix suggestions

---
 plugins/by-name/conform-nvim/default.nix | 2 +-
 plugins/by-name/neotest/default.nix      | 3 ---
 plugins/pluginmanagers/lazy.nix          | 3 ---
 wrappers/_shared.nix                     | 2 --
 wrappers/darwin.nix                      | 8 +-------
 wrappers/hm.nix                          | 7 +------
 wrappers/nixos.nix                       | 8 +-------
 7 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/plugins/by-name/conform-nvim/default.nix b/plugins/by-name/conform-nvim/default.nix
index e34bd1ba..cd8b872c 100644
--- a/plugins/by-name/conform-nvim/default.nix
+++ b/plugins/by-name/conform-nvim/default.nix
@@ -4,7 +4,7 @@
 }:
 let
   inherit (lib) types;
-  inherit (lib.nixvim) defaultNullOpts mkRaw;
+  inherit (lib.nixvim) defaultNullOpts;
 in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "conform-nvim";
diff --git a/plugins/by-name/neotest/default.nix b/plugins/by-name/neotest/default.nix
index 12fb0a0f..cbbf115e 100644
--- a/plugins/by-name/neotest/default.nix
+++ b/plugins/by-name/neotest/default.nix
@@ -3,9 +3,6 @@
   ...
 }:
 with lib;
-let
-  inherit (lib.nixvim) mkRaw;
-in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
   name = "neotest";
 
diff --git a/plugins/pluginmanagers/lazy.nix b/plugins/pluginmanagers/lazy.nix
index 8ba5fe79..dc6ecb55 100644
--- a/plugins/pluginmanagers/lazy.nix
+++ b/plugins/pluginmanagers/lazy.nix
@@ -168,9 +168,6 @@ in
       let
         pluginToLua =
           plugin:
-          let
-            keyExists = keyToCheck: attrSet: lib.elem keyToCheck (lib.attrNames attrSet);
-          in
           if isDerivation plugin then
             { dir = "${lazyPath}/${lib.getName plugin}"; }
           else
diff --git a/wrappers/_shared.nix b/wrappers/_shared.nix
index 76a81c05..9bf144b4 100644
--- a/wrappers/_shared.nix
+++ b/wrappers/_shared.nix
@@ -17,13 +17,11 @@
 }:
 let
   inherit (lib)
-    isAttrs
     listToAttrs
     map
     mkIf
     mkMerge
     mkOption
-    mkOptionType
     optionalAttrs
     setAttrByPath
     ;
diff --git a/wrappers/darwin.nix b/wrappers/darwin.nix
index 2cf24ac1..a3222d84 100644
--- a/wrappers/darwin.nix
+++ b/wrappers/darwin.nix
@@ -4,16 +4,10 @@ self:
   config,
   lib,
   ...
-}@args:
+}:
 let
   inherit (lib)
-    mkEnableOption
-    mkOption
-    mkOptionType
-    mkForce
-    mkMerge
     mkIf
-    types
     ;
   cfg = config.programs.nixvim;
   evalArgs = {
diff --git a/wrappers/hm.nix b/wrappers/hm.nix
index 22e65b0a..ba0bb7e2 100644
--- a/wrappers/hm.nix
+++ b/wrappers/hm.nix
@@ -4,15 +4,10 @@ self:
   config,
   lib,
   ...
-}@args:
+}:
 let
   inherit (lib)
-    mkEnableOption
-    mkOption
-    mkOptionType
-    mkMerge
     mkIf
-    types
     ;
   cfg = config.programs.nixvim;
   evalArgs = {
diff --git a/wrappers/nixos.nix b/wrappers/nixos.nix
index ff6a9f1e..a45da615 100644
--- a/wrappers/nixos.nix
+++ b/wrappers/nixos.nix
@@ -4,16 +4,10 @@ self:
   config,
   lib,
   ...
-}@args:
+}:
 let
   inherit (lib)
-    mkEnableOption
-    mkOption
-    mkOptionType
-    mkForce
-    mkMerge
     mkIf
-    types
     ;
   cfg = config.programs.nixvim;
   evalArgs = {