treewide: apply linter suggestions

modules/dependencies.nix

@@ -97,7 +97,7 @@ in
     extraPackages = lib.pipe cfg [
       builtins.attrValues
       (builtins.filter (p: p.enable))
-      (builtins.map (p: p.package))
+      (map (p: p.package))
     ];
 
     __depPackages = {

modules/keymaps.nix

@@ -70,7 +70,7 @@ in
 
               # NOTE: barbar added `mapOptionSubmodule` support shortly _before_ branching off 24.05
               (lib.mapAttrsToList (name: opt: opt.valueMeta) (
-                builtins.removeAttrs options.plugins.barbar.keymaps [ "silent" ]
+                removeAttrs options.plugins.barbar.keymaps [ "silent" ]
               ))
             ]
             [

modules/top-level/files/default.nix

@@ -20,7 +20,7 @@ let
       {
         _module.args = lib.pipe options._module.args [
           lib.modules.mergeAttrDefinitionsWithPrio
-          (lib.flip builtins.removeAttrs [ "name" ])
+          (lib.flip removeAttrs [ "name" ])
           (lib.mapAttrs (_: { highestPrio, value }: lib.mkOverride highestPrio value))
         ];
       }

modules/top-level/plugins/utils.nix

@@ -29,7 +29,7 @@ lib.fix (self: {
     defaultPlugin // (if p ? plugin then p else { plugin = p; });
 
   # Normalize a list of plugins
-  normalizePlugins = builtins.map self.normalizePlugin;
+  normalizePlugins = map self.normalizePlugin;
 
   getAndNormalizeDeps = p: self.normalizePlugins (p.plugin.dependencies or [ ]);
 

modules/top-level/readonly-renames.nix

@@ -21,9 +21,9 @@ let
         };
 
       go =
-        path: name: opt:
+        optPath: name: opt:
         let
-          loc = path ++ lib.singleton name;
+          loc = optPath ++ lib.singleton name;
         in
         if lib.isOption opt then mkAlias loc opt else lib.mapAttrs (go loc) opt;
     in

modules/top-level/test.nix

@@ -301,8 +301,8 @@ in
         name:
         lib.pipe cfg.${name} [
           (builtins.filter (x: !x.predicate input.${name}))
-          (builtins.map (x: x.message))
-          (builtins.map (msg: if lib.isFunction msg then msg input.${name} else msg))
+          (map (x: x.message))
+          (map (msg: if lib.isFunction msg then msg input.${name} else msg))
           (
             x:
             if x == [ ] then