From 4087bdd3e5d27e910acc512c5594444bb69a8f2e Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Fri, 1 Nov 2024 20:17:11 +0100
Subject: [PATCH] fix: gpg-keygrip path feat: nom in system-path for
 nixpkgs-review fix: include htop

---
 users/patrick/default.nix              |  1 +
 users/patrick/patrick.nix              |  1 +
 users/patrick/programs/gpg/default.nix |  2 +-
 users/patrick/programs/htop.nix        | 73 ++++++++++++++------------
 4 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/users/patrick/default.nix b/users/patrick/default.nix
index 3be63da..380cf77 100644
--- a/users/patrick/default.nix
+++ b/users/patrick/default.nix
@@ -63,6 +63,7 @@ lib.optionalAttrs (!minimal) {
     ./programs/git.nix
     ./programs/gpg
     ./programs/gpu-screen-recorder.nix
+    ./programs/htop.nix
     ./programs/kitty.nix
     ./programs/minecraft.nix
     ./programs/minion.nix
diff --git a/users/patrick/patrick.nix b/users/patrick/patrick.nix
index f18825b..7dc26b4 100644
--- a/users/patrick/patrick.nix
+++ b/users/patrick/patrick.nix
@@ -19,6 +19,7 @@
       mpv
       netflix
       nextcloud-client
+      nix-output-monitor
       nixpkgs-review
       orca-slicer
       osu-lazer-bin
diff --git a/users/patrick/programs/gpg/default.nix b/users/patrick/programs/gpg/default.nix
index a02dbe8..024c343 100644
--- a/users/patrick/programs/gpg/default.nix
+++ b/users/patrick/programs/gpg/default.nix
@@ -6,7 +6,7 @@
 }:
 {
   age.secrets."my-gpg-yubikey-keygrip.tar" = {
-    rekeyFile = ./secrets/gpg-keygrip.tar.age;
+    rekeyFile = ../../secrets/gpg-keygrip.tar.age;
     group = "patrick";
     mode = "640";
   };
diff --git a/users/patrick/programs/htop.nix b/users/patrick/programs/htop.nix
index 5ded83f..8b31d78 100644
--- a/users/patrick/programs/htop.nix
+++ b/users/patrick/programs/htop.nix
@@ -1,37 +1,40 @@
-{ config, ... }:
 {
-  hm-all.programs.htop = {
-    enable = true;
-    settings =
-      {
-        tree_view = 1;
-        highlight_base_name = 1;
-        show_cpu_frequency = 1;
-        show_cpu_temperature = 1;
-        show_program_path = 0;
-        hide_kernel_threads = 1;
-        hide_userland_threads = 1;
-        sort_key = 46; # Sort by %CPU if not in tree mode
-      }
-      // (
-        with config.lib.htop;
-        leftMeters [
-          (bar "LeftCPUs2")
-          (bar "Memory")
-          (bar "Swap")
-          (bar "ZFSARC")
-          (text "NetworkIO")
-        ]
-      )
-      // (
-        with config.lib.htop;
-        rightMeters [
-          (bar "RightCPUs2")
-          (text "LoadAverage")
-          (text "Tasks")
-          (text "Uptime")
-          (text "Systemd")
-        ]
-      );
-  };
+  hm-all =
+    { config, ... }:
+    {
+      programs.htop = {
+        enable = true;
+        settings =
+          {
+            tree_view = 1;
+            highlight_base_name = 1;
+            show_cpu_frequency = 1;
+            show_cpu_temperature = 1;
+            show_program_path = 0;
+            hide_kernel_threads = 1;
+            hide_userland_threads = 1;
+            sort_key = 46; # Sort by %CPU if not in tree mode
+          }
+          // (
+            with config.lib.htop;
+            leftMeters [
+              (bar "LeftCPUs2")
+              (bar "Memory")
+              (bar "Swap")
+              (bar "ZFSARC")
+              (text "NetworkIO")
+            ]
+          )
+          // (
+            with config.lib.htop;
+            rightMeters [
+              (bar "RightCPUs2")
+              (text "LoadAverage")
+              (text "Tasks")
+              (text "Uptime")
+              (text "Systemd")
+            ]
+          );
+      };
+    };
 }