6 files changed, 26 insertions, 15 deletions
diff --git a/modules/system/bluetui/default.nix b/modules/system/bluetui/default.nix
index a2a97ec..498659c 100644
--- a/modules/system/bluetui/default.nix
+++ b/modules/system/bluetui/default.nix
@@ -7,12 +7,12 @@
 
 # Bluetui - Terminal UI for Bluetooth management
 {
-  options.programs.bluetui = {
+  options.system.bluetui = {
     enable = lib.mkEnableOption "Enables bluetui.";
     package = lib.mkPackageOption pkgs "bluetui" { };
   };
 
-  config = lib.mkIf config.programs.bluetui.enable {
-    home.packages = [ config.programs.bluetui.package ];
+  config = lib.mkIf config.system.bluetui.enable {
+    home.packages = [ config.system.bluetui.package ];
   };
 }
diff --git a/modules/system/bottom/default.nix b/modules/system/bottom/default.nix
index 3ecda86..59a2a43 100644
--- a/modules/system/bottom/default.nix
+++ b/modules/system/bottom/default.nix
@@ -7,9 +7,15 @@
 
 # Bottom - Cross-platform graphical process/system monitor (Rust-based)
 {
-  config = lib.mkIf config.programs.bottom.enable {
+  options.system.bottom = {
+    enable = lib.mkEnableOption "Enables bottom.";
+    package = lib.mkPackageOption pkgs "bottom" { };
+  };
+
+  config = lib.mkIf config.system.bottom.enable {
     programs.bottom = {
-      package = pkgs.bottom;
+      enable = true;
+      package = config.system.bottom.package;
     };
   };
 }
diff --git a/modules/system/brightnessctl/default.nix b/modules/system/brightnessctl/default.nix
index cea3517..b95ddb4 100644
--- a/modules/system/brightnessctl/default.nix
+++ b/modules/system/brightnessctl/default.nix
@@ -7,12 +7,12 @@
 
 # brightnessctl - Backlight brightness control tool
 {
-  options.programs.brightnessctl = {
+  options.system.brightnessctl = {
     enable = lib.mkEnableOption "Enables brightnessctl.";
     package = lib.mkPackageOption pkgs "brightnessctl" { };
   };
 
-  config = lib.mkIf config.programs.brightnessctl.enable {
-    home.packages = [ config.programs.brightnessctl.package ];
+  config = lib.mkIf config.system.brightnessctl.enable {
+    home.packages = [ config.system.brightnessctl.package ];
   };
 }
diff --git a/modules/system/htop/default.nix b/modules/system/htop/default.nix
index 7781464..cf36f41 100644
--- a/modules/system/htop/default.nix
+++ b/modules/system/htop/default.nix
@@ -7,8 +7,13 @@
 
 # Htop - Interactive process viewer (using htop-vim version)
 {
-  config = lib.mkIf config.programs.htop.enable {
+  options.system.htop = {
+    enable = lib.mkEnableOption "Enables htop.";
+  };
+
+  config = lib.mkIf config.system.htop.enable {
     programs.htop = {
+      enable = true;
       package = pkgs.htop-vim;
     };
   };
diff --git a/modules/system/nvtop/default.nix b/modules/system/nvtop/default.nix
index 19dd61b..8b41978 100644
--- a/modules/system/nvtop/default.nix
+++ b/modules/system/nvtop/default.nix
@@ -7,7 +7,7 @@
 
 # Nvtop - GPU process monitor (NVIDIA/AMD/Intel GPUs)
 {
-  options.programs.nvtop = {
+  options.system.nvtop = {
     enable = lib.mkEnableOption "Enables nvtop.";
     package = lib.mkOption {
       type = lib.types.package;
@@ -17,7 +17,7 @@
     };
   };
 
-  config = lib.mkIf config.programs.nvtop.enable {
-    home.packages = [ config.programs.nvtop.package ];
+  config = lib.mkIf config.system.nvtop.enable {
+    home.packages = [ config.system.nvtop.package ];
   };
 }
diff --git a/modules/system/systemctl-tui/default.nix b/modules/system/systemctl-tui/default.nix
index 77dca8c..1b151cf 100644
--- a/modules/system/systemctl-tui/default.nix
+++ b/modules/system/systemctl-tui/default.nix
@@ -7,12 +7,12 @@
 
 # systemctl-tui - TUI for systemctl (systemd service management)
 {
-  options.programs.systemctl-tui = {
+  options.system.systemctl-tui = {
     enable = lib.mkEnableOption "Enables systemctl-tui.";
     package = lib.mkPackageOption pkgs "systemctl-tui" { };
   };
 
-  config = lib.mkIf config.programs.systemctl-tui.enable {
-    home.packages = [ config.programs.systemctl-tui.package ];
+  config = lib.mkIf config.system.systemctl-tui.enable {
+    home.packages = [ config.system.systemctl-tui.package ];
   };
 }