From 63a1240998f7cfca0894e02955080bb39c3ea58f Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Sat, 30 May 2020 21:11:31 +0100
Subject: modules/{base,packages}: Use programs.* wrapper

Replacing the simple inclusion of some programs in packages with
their respective programs.* equivalent.
---
 modules/user/devhell/profiles/base.nix     | 32 ++++++++++++++++++++----------
 modules/user/devhell/profiles/packages.nix |  5 -----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix
index 2f09a689..7b9fdfc1 100644
--- a/modules/user/devhell/profiles/base.nix
+++ b/modules/user/devhell/profiles/base.nix
@@ -70,17 +70,29 @@ in {
         enableCompletion = true;
       };
       bash = {
+        enable = true;
         enableCompletion = true;
-        promptInit = ''
-          # Provide a nice prompt.
-          PROMPT_COLOR="1;31m"
-          let $UID && PROMPT_COLOR="1;32m"
-          PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
-          if test "$TERM" = "xterm"; then
-            PS1="\[\033]2;\h:\u:\w\007\]$PS1"
-          fi
-          eval `dircolors ~/.dir_colors`
-        '';
+      };
+      iftop = {
+        enable = true;
+      };
+      iotop = {
+        enable = true;
+      };
+      less = {
+        enable = true;
+      };
+      screen = {
+        enable = true;
+      };
+      tmux = {
+        enable = true;
+      };
+      traceroute = {
+        enable = true;
+      };
+      wireshark = {
+        enable = true;
       };
     };
 
diff --git a/modules/user/devhell/profiles/packages.nix b/modules/user/devhell/profiles/packages.nix
index 80ec3272..5b239e84 100644
--- a/modules/user/devhell/profiles/packages.nix
+++ b/modules/user/devhell/profiles/packages.nix
@@ -132,9 +132,7 @@ in {
       htop
       httpie
       i3lock-fancy
-      iftop
       imagemagick
-      iotop
       ipcalc
       iprange
       iptraf-ng
@@ -202,7 +200,6 @@ in {
       rstudio
       rsync
       safecopy
-      screen
       scrot
       shntool
       signal-desktop
@@ -226,7 +223,6 @@ in {
       testdisk
       tig
       tldr
-      tmux
       toilet
       transcode
       tree
@@ -263,7 +259,6 @@ in {
       which
       wipe
       wireguard
-      wireshark
       wordgrinder
       xfsprogs
       xlibs.xev
-- 
cgit 1.4.1