refactor users activation. refactor home manager config to match nixos conf and move tjkeller archetypes to users/timmy. update many of the exising home manager configs to be nicer and better organized. profile archetypes now include homeconfigs which can be enabled per user, and are setup using a new mkProfileArchetype function.

1 files changed, 45 insertions, 37 deletions

diff --git a/home-manager/htop.nix b/home-manager/htop.nix
index 523fee8..36ccbac 100644
--- a/home-manager/htop.nix
+++ b/home-manager/htop.nix
@@ -1,38 +1,46 @@
-{ config, ... }: {
-	programs.htop.enable = true;
-	programs.htop.settings = {
-		fields = with config.lib.htop.fields; [
-			PID
-			USER
-			124  # EXE
-			PERCENT_CPU
-			PERCENT_MEM
-			STARTTIME
-			ELAPSED  # time elapsed since process start
-			IO_READ_RATE
-			RBYTES  # num read bytes
-			IO_WRITE_RATE
-			WBYTES  # num written bytes
-			TIME
-			STIME  # sys time
-			CSTIME  # child sys time
-			NICE
-			STATE
-			PRIORITY
-			125  # CWD
-		];
-	} // (with config.lib.htop; leftMeters [
-		(bar "AllCPUs2")
-		(bar "CPU")
-		(bar "Memory")
-		(bar "DiskIO")
-		(bar "NetworkIO")
-	]) // (with config.lib.htop; rightMeters [
-		(text "Hostname")
-		(text "Clock")
-		(text "Uptime")
-		(text "Battery")
-		(text "LoadAverage")
-		(text "Tasks")
-	]);
+{ config, lib, ... }: let
+	cfg = config.programs.htop;
+in {
+	options.programs.htop = {
+		_configure = lib.mkEnableOption "apply sensible defaults to htop";
+	};
+
+	config = lib.mkIf cfg._configure {
+		programs.htop.enable = lib.mkDefault true;
+		programs.htop.settings = {
+			fields = with config.lib.htop.fields; [
+				PID
+				USER
+				124  # EXE
+				PERCENT_CPU
+				PERCENT_MEM
+				STARTTIME
+				ELAPSED  # time elapsed since process start
+				IO_READ_RATE
+				RBYTES  # num read bytes
+				IO_WRITE_RATE
+				WBYTES  # num written bytes
+				TIME
+				STIME  # sys time
+				CSTIME  # child sys time
+				NICE
+				STATE
+				PRIORITY
+				125  # CWD
+			];
+		} // (with config.lib.htop; leftMeters [
+			(bar "AllCPUs2")
+			(bar "CPU")
+			(bar "Memory")
+			(bar "DiskIO")
+			(bar "NetworkIO")
+		]) // (with config.lib.htop; rightMeters [
+			(text "Hostname")
+			(text "Clock")
+			(text "Uptime")
+			(text "Battery")
+			(text "LoadAverage")
+			(text "Tasks")
+		]);
+	};
 }