From 5018ba70cdcd28e95ee6f401bda1fe2180734ef5 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <hg@lukegb.com> Date: Sun, 14 Feb 2021 21:40:41 +0000 Subject: [PATCH] home-manager/common: add iotop/iftop --- ops/nixos/lib/home-manager/client.nix | 3 --- ops/nixos/lib/home-manager/common.nix | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ops/nixos/lib/home-manager/client.nix b/ops/nixos/lib/home-manager/client.nix index d51dcef2cd..b408138b0c 100644 --- a/ops/nixos/lib/home-manager/client.nix +++ b/ops/nixos/lib/home-manager/client.nix @@ -38,8 +38,6 @@ in ''; home.packages = lib.mkAfter (with pkgs; ([ - iftop - htop go gopls goimports @@ -47,6 +45,5 @@ in youtube-dl ] ++ lib.optionals isLinux [ depot.nix.pkgs.copybara - iotop ])); } diff --git a/ops/nixos/lib/home-manager/common.nix b/ops/nixos/lib/home-manager/common.nix index 20a477b233..0f3762a4e1 100644 --- a/ops/nixos/lib/home-manager/common.nix +++ b/ops/nixos/lib/home-manager/common.nix @@ -79,9 +79,12 @@ in exec "${home-manager}/bin/home-manager" -f "${config.home.homeDirectory}/depot/home-manager-ext.nix" -A "${configName}" "$@" '') rxvt_unicode.terminfo tmux rsync libarchive tcpdump restic + iftop htop (mercurial.overridePythonAttrs (origAttrs: { propagatedBuildInputs = [python3Packages.hg-evolve depot.nix.pkgs.hg-git]; })) + ] ++ lib.optionals isLinux [ + iotop ])); home.stateVersion = "20.09";