From 8557c959794d8306750fb1951a3d4792c2f4eece Mon Sep 17 00:00:00 2001
From: joachimschmidt557 <joachim.schmidt557@outlook.com>
Date: Wed, 4 May 2022 09:54:08 +0200
Subject: [PATCH] dustbowl: Add rr, intel_gpu_top wrappers

---
 nixos/dustbowl.nix | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/nixos/dustbowl.nix b/nixos/dustbowl.nix
index 6f24821..970ff5c 100644
--- a/nixos/dustbowl.nix
+++ b/nixos/dustbowl.nix
@@ -54,18 +54,11 @@
     "v4l2loopback"
   ];
 
-  programs.adb.enable = true;
-
-  # Set sysctl parameters
-  boot.kernel.sysctl = {
-    # Useful for rr
-    "kernel.perf_event_paranoid" = 1;
-  };
-
   # Add qemu-binfmt for ARM and AArch64
   boot.binfmt.emulatedSystems = [
     "armv7l-linux"
     "aarch64-linux"
+    "riscv64-linux"
   ];
 
   services.fwupd.enable = true;
@@ -148,8 +141,8 @@
     bind.dnsutils
     openrgb
     gdb
-    rr
     intel-gpu-tools
+    config.boot.kernelPackages.perf
 
     # GTK theme
     gnome.adwaita-icon-theme
@@ -171,6 +164,7 @@
     zathura
     imv
     pavucontrol
+    xournalpp
   ];
 
   # Use doas instead of sudo
@@ -186,6 +180,20 @@
     ];
   };
 
+  security.wrappers.rr = {
+    owner = "root";
+    group = "root";
+    capabilities = "cap_perfmon=ip";
+    source = "${pkgs.rr}/bin/rr";
+    };
+
+  security.wrappers.intel_gpu_top = {
+    owner = "root";
+    group = "root";
+    capabilities = "cap_perfmon=p";
+    source = "${pkgs.intel-gpu-tools}/bin/intel_gpu_top";
+  };
+
   # Enable gnupg
   programs.gnupg.agent.enable = true;
 
@@ -288,10 +296,6 @@
 
   virtualisation.libvirtd.enable = true;
 
-  services.postgresql = {
-    enable = true;
-  };
-
   users.users.joachim = {
     isNormalUser = true;
     home = "/home/joachim";