motiejus
/
config
1
Fork 0
Code Packages Releases Activity

arm64: skip perf tools 

doesn't build on the custome kernel
This commit is contained in:
Motiejus Jakštys 2024-03-07 13:08:40 +02:00
parent c001078e56
commit d4a6e36fd1
2 changed files with 90 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
modules/base/default.nix
View File

@ -32,6 +32,11 @@ in {
}; };
username = lib.mkOption {type = str;}; username = lib.mkOption {type = str;};
skipPerf = lib.mkOption {
type = bool;
default = false;
};
}; };
config = { config = {
@ -83,88 +88,91 @@ in {
}; };
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs;
jc # parse different formats and command outputs to json lib.mkMerge [
jq # parse, format and query json documents [
pv # pipe viewer for progressbars in pipes jc # parse different formats and command outputs to json
bat # "bat - cat with wings", cat|less with language highlight jq # parse, format and query json documents
duf # nice disk usage output pv # pipe viewer for progressbars in pipes
git bat # "bat - cat with wings", cat|less with language highlight
htop duf # nice disk usage output
file # file duh git
host # look up host info htop
tree # tree duh file # file duh
lsof # lsof yay host # look up host info
rage # encrypt-decrypt tree # tree duh
ncdu # disk usage navigator lsof # lsof yay
lshw rage # encrypt-decrypt
entr ncdu # disk usage navigator
cloc lshw
poop # hopefully poof some day entr
tokei cloc
sshfs poop # hopefully poof some day
pwgen tokei
parted sshfs
bloaty pwgen
sqlite parted
dhcpcd bloaty
hdparm sqlite
sdparm dhcpcd
procps hdparm
vimv-rs sdparm
sysstat procps
ripgrep vimv-rs
ethtool sysstat
gettext ripgrep
keyutils ethtool
usbutils gettext
pciutils keyutils
bsdgames usbutils
parallel pciutils
yamllint bsdgames
binutils parallel
hyperfine yamllint
stress-ng binutils
dmidecode hyperfine
moreutils stress-ng
cryptsetup dmidecode
lm_sensors moreutils
smartmontools cryptsetup
unixtools.xxd lm_sensors
bcachefs-tools smartmontools
unixtools.xxd
bcachefs-tools
# networking # networking
wol wol
dig dig
nmap nmap
# broken on aarch64-linux # broken on aarch64-linux
#wrk2 #wrk2
wget wget
curl curl
btop btop
ngrep ngrep
iftop iftop
whois whois
ipset ipset
iperf3 iperf3
jnettop jnettop
openssl openssl
tcpdump tcpdump
testssl testssl
dnsutils dnsutils
bandwhich bandwhich
speedtest-cli speedtest-cli
nix-output-monitor nix-output-monitor
config.boot.kernelPackages.perf
# compression/decompression # compression/decompression
xz xz
pigz pigz
zstd zstd
p7zip p7zip
zopfli zopfli
brotli brotli
]; ]
(lib.mkIf (!cfg.skipPerf) config.boot.kernelPackages.perf)
];
}; };
programs = { programs = {

2
shared/platform/orangepi5plus.nix
View File

@ -8,6 +8,8 @@
crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform; crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform;
crossNative = pkgs.pkgsCross.aarch64-multiplatform; crossNative = pkgs.pkgsCross.aarch64-multiplatform;
in { in {
mj.skipPerf = true;
boot = { boot = {
kernelPackages = crossNative.linuxPackagesFor (crossFast.buildLinux rec { kernelPackages = crossNative.linuxPackagesFor (crossFast.buildLinux rec {
version = "6.8.0-rc7"; version = "6.8.0-rc7";