diff options
| -rw-r--r-- | hosts/common/system/software.nix | 9 | ||||
| -rw-r--r-- | users/fcuny/cli/default.nix | 1 | ||||
| -rw-r--r-- | users/fcuny/cli/tools.nix | 12 |
3 files changed, 8 insertions, 14 deletions
diff --git a/hosts/common/system/software.nix b/hosts/common/system/software.nix index fa919ae..1f746fb 100644 --- a/hosts/common/system/software.nix +++ b/hosts/common/system/software.nix @@ -1,14 +1,18 @@ {pkgs, config, lib, ...}: -{ +with lib; +let linuxpkgs = config.boot.kernelPackages; +in { environment.systemPackages = with pkgs; [ curl dmidecode + flameGraph git htop hwdata iftop iptraf-ng + linuxpkgs.perf lm_sensors lsb-release mg @@ -16,6 +20,7 @@ openssl parted pciutils + perf-tools rsync strace tcpdump @@ -26,4 +31,6 @@ vim wget ]; + + programs.bcc.enable = true; } diff --git a/users/fcuny/cli/default.nix b/users/fcuny/cli/default.nix index 5259014..3599ac9 100644 --- a/users/fcuny/cli/default.nix +++ b/users/fcuny/cli/default.nix @@ -6,7 +6,6 @@ ./go.nix ./tmux.nix ./zsh.nix - ./tools.nix ]; home.packages = [ diff --git a/users/fcuny/cli/tools.nix b/users/fcuny/cli/tools.nix deleted file mode 100644 index bd38c72..0000000 --- a/users/fcuny/cli/tools.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, config, lib, ...}: - -{ - environment.systemPackages = with pkgs; [ - # use the correct version of `perf` for the configured `linuxPackages` - linuxpkgs.perf - perf-tools - flameGraph - ]; - # this uses correct `linuxPackages` for `bcc` - programs.bcc.enable = true; -} |