Merge remote-tracking branch 'lass/master'

3 files changed, 44 insertions, 0 deletions

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 33fb7e492..e170156a4 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -28,6 +28,7 @@ with import <stockholm/lib>;
     ./audit.nix
     ./backup.nix
     ./bash.nix
+    ./htop.nix
     ./nginx
     ./ssh.nix
     ./sshd.nix
diff --git a/tv/2configs/htop.nix b/tv/2configs/htop.nix
new file mode 100644
index 000000000..409df2516
--- /dev/null
+++ b/tv/2configs/htop.nix
@@ -0,0 +1,40 @@
+{ pkgs, ... }:
+
+with import <stockholm/lib>;
+
+{
+  nixpkgs.config.packageOverrides = super: {
+    htop = pkgs.concat "htop" [
+      super.htop
+      (pkgs.writeDashBin "htop" ''
+        export HTOPRC=${pkgs.writeText "htoprc" ''
+          fields=0 48 17 18 38 39 40 2 46 47 49 1
+          sort_key=46
+          sort_direction=1
+          hide_threads=0
+          hide_kernel_threads=1
+          hide_userland_threads=0
+          shadow_other_users=1
+          show_thread_names=1
+          show_program_path=1
+          highlight_base_name=1
+          highlight_megabytes=1
+          highlight_threads=1
+          tree_view=1
+          header_margin=1
+          detailed_cpu_time=0
+          cpu_count_from_zero=0
+          update_process_names=0
+          account_guest_in_cpu_meter=1
+          color_scheme=0
+          delay=15
+          left_meters=LeftCPUs2 RightCPUs2 Memory Swap
+          left_meter_modes=1 1 1 1
+          right_meters=Uptime Tasks LoadAverage Battery
+          right_meter_modes=2 2 2 2
+        ''}
+        exec ${super.htop}/bin/htop "$@"
+      '')
+    ];
+  };
+}
diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix
index 2a3b5cbc1..418551213 100644
--- a/tv/2configs/pulse.nix
+++ b/tv/2configs/pulse.nix
@@ -76,6 +76,9 @@ in
     };
   };
 
+  # TODO assert that pulse is the only user with "audio" in group/extraGroups
+  # otherwise the audio device can be hijacked while the pulse service restarts
+  # (e.g. when mpv is running) and then the service will fail.
   users = {
     groups.pulse.gid = config.users.users.pulse.uid;
     users.pulse = {