From 74429f245d366e783ecbcfb0ebd83a7f57e78e6a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 27 Jun 2017 10:01:16 +0200
Subject: tv: add htop to default systemPackages

---
 tv/1systems/cd.nix      | 1 -
 tv/1systems/wu.nix      | 1 -
 tv/1systems/xu.nix      | 1 -
 tv/1systems/zu.nix      | 1 -
 tv/2configs/default.nix | 3 ++-
 5 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 108006f34..9f2cec574 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -25,7 +25,6 @@ with import <stockholm/lib>;
   };
 
   environment.systemPackages = with pkgs; [
-    htop
     iftop
     iotop
     iptables
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 60f9fa100..4b3bf8538 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -31,7 +31,6 @@ with import <stockholm/lib>;
         get
         gnupg1compat
         haskellPackages.hledger
-        htop
         jq
         mkpasswd
         netcat
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 3add01748..d82f45ac0 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -34,7 +34,6 @@ with import <stockholm/lib>;
         file
         gnupg1compat
         haskellPackages.hledger
-        htop
         jq
         krebszones
         mkpasswd
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index 5552ef065..4fae3ca75 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -36,7 +36,6 @@ with import <stockholm/lib>;
         file
         gnupg1compat
         haskellPackages.hledger
-        htop
         jq
         mkpasswd
         netcat
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 4a1247ef5..d248bf578 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -158,9 +158,10 @@ with import <stockholm/lib>;
     {
       environment.systemPackages = [
         pkgs.get
+        pkgs.htop
         pkgs.krebspaste
-        pkgs.ovh-zone
         pkgs.nix-prefetch-scripts
+        pkgs.ovh-zone
         pkgs.push
       ];
     }
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/4c000000.lock: No such file or directory (2)