From 5ed071c0ed1cfe46438dade216c200190ded4e88 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Fri, 5 Feb 2021 17:33:42 +0100
Subject: [PATCH] Move admin tools to system tools

Fixes #37.

This also removes some tools from the user profile since I do not need
them anymore.
---
 modules/tools.nix                | 30 ++++++++++++++++++++++++++++++
 users/simon/modules/programs.nix | 23 +----------------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/modules/tools.nix b/modules/tools.nix
index 1b952ab..4cee221 100644
--- a/modules/tools.nix
+++ b/modules/tools.nix
@@ -6,4 +6,34 @@
     bandwhich.enable = true;
     iotop.enable = true;
   };
+
+  environment.systemPackages = with pkgs; [
+    # top like tools
+    bmon # network monitor
+    mtr # interactive traceroute
+
+    # batch processing/automation
+    jq # sed for json
+
+    # file tools
+    dos2unix # convert CRLF (dos) or CR (classic mac) line endings to LF (unix)
+    file # file type
+    ncdu # interactive du
+    rename # sed for filenames
+    wget # download tool
+
+    # network tools
+    dnsutils # dig
+    iperf
+    iperf2 # bandwidth measurement tool
+    nmap # port scanner
+    vnstat # client for vnstatd
+
+    # system tools
+    lm_sensors # temperature sensors
+    pciutils # lspci
+    reptyr # move process to current terminal
+    smartmontools # hard drive monitoring
+    usbutils # lsusb
+  ];
 }
diff --git a/users/simon/modules/programs.nix b/users/simon/modules/programs.nix
index f186c83..b826c76 100644
--- a/users/simon/modules/programs.nix
+++ b/users/simon/modules/programs.nix
@@ -26,13 +26,7 @@ let
 in
 {
   home.packages = with pkgs; [
-    # top like tools
-    bmon # network monitor
-    gotop # fancy top
-    mtr # interactive traceroute
-
     # batch processing/automation
-    jq # sed for json
     parallel # parallel batch processing
     yq # sed for yaml
 
@@ -44,9 +38,7 @@ in
 
     # file tools
     aria # multithreaded http/ftp/bittorrent download manager
-    dos2unix # convert CRLF (dos) or CR (classic mac) line endings to LF (unix)
     fdupes # find duplicate files
-    file # file type
     hexyl # user friendly hex file viewer
     hyperfine # cli benchmarking
     megatools # cli for mega.nz
@@ -54,10 +46,7 @@ in
     mktorrent # bittorrent seed file generator
     ntfs3g # ntfs filesystem driver
     rclone # rsync for cloud storage
-    rename # sed for filenames
-    rsync # incremental file transfer
     tokei # fast cloc
-    wget # download tool
     xdelta # binary diff
 
     # file format tools
@@ -65,14 +54,10 @@ in
     (p7zip.override { enableUnfree = config.sbruder.unfree.allowSoftware; }) # 7z cli (with optional rar support)
     pdftk # pdf multitool
     sqlite-interactive # cli for sqlite databses
-    upx # executable packer
 
     # network tools
     dnsutils # dig
-    gatling # high performance web serve
-    iperf
-    iperf2 # bandwidth measurement tool
-    nmap # port scanner
+    gatling # high performance web server
     sshfs # mount remote host
     vnstat # client for vnstatd
     whois # whois client
@@ -80,12 +65,6 @@ in
 
     # system tools
     libva-utils # vainfo
-    lm_sensors # temperature sensors
-    ncdu # interactive du
-    pciutils # lspci
-    reptyr # move process to current terminal
-    smartmontools # hard drive monitoring
-    usbutils # lsusb
 
     # clients
     drone-cli # client for drone ci