shell: Prefer with pkgs; over mkMerge

This commit is contained in:
Donovan Glover 2024-08-16 03:09:32 -04:00
parent b513d01715
commit 4e2fda8b4e
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65

View File

@ -1,9 +1,7 @@
{ pkgs, lib, ... }: { pkgs, ... }:
let let
inherit (pkgs) fish; inherit (pkgs) fish;
inherit (lib) mkMerge;
inherit (builtins) attrValues;
in in
{ {
users.defaultUserShell = fish; users.defaultUserShell = fish;
@ -19,97 +17,81 @@ in
GATSBY_TELEMETRY_DISABLED = "1"; GATSBY_TELEMETRY_DISABLED = "1";
}; };
systemPackages = mkMerge [ systemPackages = with pkgs; [
(attrValues { jq
inherit (pkgs) eza
jq fd
eza fzf
fd ripgrep
fzf xh
ripgrep file
xh timg
file choose
timg sd
choose rustscan
sd treefmt
rustscan yt-dlp
; sox
inherit (pkgs) asak
treefmt timer
yt-dlp dig
sox mtr
asak mediainfo
timer fdupes
dig whois
mtr killall
mediainfo trashy
fdupes hwinfo
whois stress
killall hdparm
trashy recode
hwinfo rmlint
stress jpegoptim
hdparm pass
recode sudachi-rs
rmlint tango
jpegoptim npm-check-updates
pass fastfetch
sudachi-rs onefetch
tango scc
npm-check-updates genact
; dwt1-shell-color-scripts
inherit (pkgs) colorpanes
fastfetch sanctity
onefetch cmatrix
scc gdu
genact hexyl
dwt1-shell-color-scripts diskonaut
colorpanes pgcli
sanctity litecli
cmatrix p7zip
; unar
inherit (pkgs) rsync
gdu rclone
hexyl ffmpeg
diskonaut imagemagick
pgcli smartmontools
litecli restic
; borgbackup
inherit (pkgs) zbar
p7zip phraze
unar lychee
rsync ventoy
rclone taskwarrior3
ffmpeg nixpkgs-review
imagemagick nix-update
smartmontools statix
restic nvd
borgbackup nix-search-cli
zbar nix-tree
phraze rustc
lychee rustfmt
ventoy cargo
taskwarrior3 cargo-tarpaulin
; bacon
inherit (pkgs) clippy
nixpkgs-review nodejs
nix-update deno
statix
nvd
nix-search-cli
nix-tree
;
inherit (pkgs)
rustc
rustfmt
cargo
cargo-tarpaulin
bacon
clippy
nodejs
deno
;
})
]; ];
}; };