shell: Prefer with pkgs; over mkMerge

modules/shell.nix

@@ -1,9 +1,7 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 
 let
   inherit (pkgs) fish;
-  inherit (lib) mkMerge;
-  inherit (builtins) attrValues;
 in
 {
   users.defaultUserShell = fish;
@@ -19,9 +17,7 @@ in
       GATSBY_TELEMETRY_DISABLED = "1";
     };
 
-    systemPackages = mkMerge [
+    systemPackages = with pkgs; [
-      (attrValues {
-        inherit (pkgs)
       jq
       eza
       fd
@@ -33,8 +29,6 @@ in
       choose
       sd
       rustscan
-          ;
-        inherit (pkgs)
       treefmt
       yt-dlp
       sox
@@ -57,8 +51,6 @@ in
       sudachi-rs
       tango
       npm-check-updates
-          ;
-        inherit (pkgs)
       fastfetch
       onefetch
       scc
@@ -67,15 +59,11 @@ in
       colorpanes
       sanctity
       cmatrix
-          ;
-        inherit (pkgs)
       gdu
       hexyl
       diskonaut
       pgcli
       litecli
-          ;
-        inherit (pkgs)
       p7zip
       unar
       rsync
@@ -90,16 +78,12 @@ in
       lychee
       ventoy
       taskwarrior3
-          ;
-        inherit (pkgs)
       nixpkgs-review
       nix-update
       statix
       nvd
       nix-search-cli
       nix-tree
-          ;
-        inherit (pkgs)
       rustc
       rustfmt
       cargo
@@ -108,8 +92,6 @@ in
       clippy
       nodejs
       deno
-          ;
-      })
     ];
   };