From 43cb41ef0ff31f549358e79f91487707cf5777b2 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Fri, 23 Aug 2024 13:54:31 +0000 Subject: [PATCH] nixos-mod: add env pkgs to debugMinimal & hwCommon from useable --- nix/nixos-modules/debugMinimal.nix | 5 +++++ nix/nixos-modules/hwCommon.nix | 5 +++++ nix/nixos-modules/useable.nix | 5 ----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nix/nixos-modules/debugMinimal.nix b/nix/nixos-modules/debugMinimal.nix index 3c7b759..71a30a8 100644 --- a/nix/nixos-modules/debugMinimal.nix +++ b/nix/nixos-modules/debugMinimal.nix @@ -23,6 +23,11 @@ in config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + jq # JSON + pv + ]; + programs = { bash = { diff --git a/nix/nixos-modules/hwCommon.nix b/nix/nixos-modules/hwCommon.nix index 00763cb..3485be6 100644 --- a/nix/nixos-modules/hwCommon.nix +++ b/nix/nixos-modules/hwCommon.nix @@ -74,6 +74,11 @@ in }; + environment.systemPackages = with pkgs; [ + pciutils + usbutils + ]; + hardware = { cpu = lib.mkMerge [ diff --git a/nix/nixos-modules/useable.nix b/nix/nixos-modules/useable.nix index 14bbe30..7bfcd93 100644 --- a/nix/nixos-modules/useable.nix +++ b/nix/nixos-modules/useable.nix @@ -71,19 +71,14 @@ in bat batmon # TODO only on systems wich batteries - jq # JSON manix massren nethogs reptyr - pciutils psitop - pv unixtools.xxd up # ultimate plumber usbtop - usbutils - ]; programs = {