12 files changed, 72 insertions, 12 deletions
diff --git a/modules/desktop/wl-clipboard/default.nix b/modules/desktop/wl-clipboard/default.nix
index e2908a9..956a792 100644
--- a/modules/desktop/wl-clipboard/default.nix
+++ b/modules/desktop/wl-clipboard/default.nix
@@ -7,7 +7,12 @@
 }:
 {
   options.desktop.wl-clipboard = {
-    package = lib.mkPackageOption pkgs "wl-clipboard" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.wl-clipboard;
+      description = "The wl-clipboard package to use.";
+    };
   };
 
   config = lib.mkIf config.desktop.enable {
diff --git a/modules/development/bruno/default.nix b/modules/development/bruno/default.nix
index 8684264..7c7afa2 100644
--- a/modules/development/bruno/default.nix
+++ b/modules/development/bruno/default.nix
@@ -8,7 +8,12 @@
 {
   options.development.bruno = {
     enable = lib.mkEnableOption "Enables bruno.";
-    package = lib.mkPackageOption pkgs "bruno" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.bruno;
+      description = "The bruno package to use.";
+    };
   };
 
   config = lib.mkIf config.development.bruno.enable {
diff --git a/modules/media/grim/default.nix b/modules/media/grim/default.nix
index 5a0536c..549ed01 100644
--- a/modules/media/grim/default.nix
+++ b/modules/media/grim/default.nix
@@ -8,7 +8,12 @@
 {
   options.media.grim = {
     enable = lib.mkEnableOption "Enables grim.";
-    package = lib.mkPackageOption pkgs "grim" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.grim;
+      description = "The grim package to use.";
+    };
   };
 
   config = lib.mkIf config.media.grim.enable {
diff --git a/modules/media/pamixer/default.nix b/modules/media/pamixer/default.nix
index 9934648..e3c42be 100644
--- a/modules/media/pamixer/default.nix
+++ b/modules/media/pamixer/default.nix
@@ -8,7 +8,12 @@
 {
   options.media.pamixer = {
     enable = lib.mkEnableOption "Enables pamixer.";
-    package = lib.mkPackageOption pkgs "pamixer" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.pamixer;
+      description = "The pamixer package to use.";
+    };
   };
 
   config = lib.mkIf config.media.pamixer.enable {
diff --git a/modules/media/playerctl/default.nix b/modules/media/playerctl/default.nix
index 3c15f11..bf71f06 100644
--- a/modules/media/playerctl/default.nix
+++ b/modules/media/playerctl/default.nix
@@ -8,7 +8,12 @@
 {
   options.media.playerctl = {
     enable = lib.mkEnableOption "Enables playerctl.";
-    package = lib.mkPackageOption pkgs "playerctl" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.playerctl;
+      description = "The playerctl package to use.";
+    };
   };
 
   config = lib.mkIf config.media.playerctl.enable {
diff --git a/modules/media/slurp/default.nix b/modules/media/slurp/default.nix
index 39a8a12..d1d8e32 100644
--- a/modules/media/slurp/default.nix
+++ b/modules/media/slurp/default.nix
@@ -8,7 +8,12 @@
 {
   options.media.slurp = {
     enable = lib.mkEnableOption "Enables slurp.";
-    package = lib.mkPackageOption pkgs "slurp" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.slurp;
+      description = "The slurp package to use.";
+    };
   };
 
   config = lib.mkIf config.media.slurp.enable {
diff --git a/modules/media/vlc/default.nix b/modules/media/vlc/default.nix
index 0d32e3b..34d8fb8 100644
--- a/modules/media/vlc/default.nix
+++ b/modules/media/vlc/default.nix
@@ -8,7 +8,12 @@
 {
   options.media.vlc = {
     enable = lib.mkEnableOption "Enables vlc.";
-    package = lib.mkPackageOption pkgs "vlc" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.vlc;
+      description = "The vlc package to use.";
+    };
   };
 
   config = lib.mkIf config.media.vlc.enable {
diff --git a/modules/media/wf-recorder/default.nix b/modules/media/wf-recorder/default.nix
index 6f19a38..5c2cbd6 100644
--- a/modules/media/wf-recorder/default.nix
+++ b/modules/media/wf-recorder/default.nix
@@ -8,7 +8,12 @@
 {
   options.media.wf-recorder = {
     enable = lib.mkEnableOption "Enables wf-recorder.";
-    package = lib.mkPackageOption pkgs "wf-recorder" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.wf-recorder;
+      description = "The wf-recorder package to use.";
+    };
   };
 
   config = lib.mkIf config.media.wf-recorder.enable {
diff --git a/modules/networking/bluetui/default.nix b/modules/networking/bluetui/default.nix
index 446f0f5..304ab4d 100644
--- a/modules/networking/bluetui/default.nix
+++ b/modules/networking/bluetui/default.nix
@@ -12,7 +12,12 @@
 
   options.networking.bluetui = {
     enable = lib.mkEnableOption "Enables bluetui.";
-    package = lib.mkPackageOption pkgs "bluetui" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.bluetui;
+      description = "The bluetui package to use.";
+    };
   };
 
   config = lib.mkIf config.networking.bluetui.enable {
diff --git a/modules/networking/impala/default.nix b/modules/networking/impala/default.nix
index 8f3d209..aa62e08 100644
--- a/modules/networking/impala/default.nix
+++ b/modules/networking/impala/default.nix
@@ -12,7 +12,12 @@
 
   options.networking.impala = {
     enable = lib.mkEnableOption "Enables impala.";
-    package = lib.mkPackageOption pkgs "impala" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.impala;
+      description = "The impala package to use.";
+    };
   };
 
   config = lib.mkIf config.networking.impala.enable {
diff --git a/modules/system/brightnessctl/default.nix b/modules/system/brightnessctl/default.nix
index e8fafb7..af5746a 100644
--- a/modules/system/brightnessctl/default.nix
+++ b/modules/system/brightnessctl/default.nix
@@ -8,7 +8,12 @@
 {
   options.system.brightnessctl = {
     enable = lib.mkEnableOption "Enables brightnessctl.";
-    package = lib.mkPackageOption pkgs "brightnessctl" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.brightnessctl;
+      description = "The brightnessctl package to use.";
+    };
   };
 
   config = lib.mkIf config.system.brightnessctl.enable {
diff --git a/modules/system/systemctl-tui/default.nix b/modules/system/systemctl-tui/default.nix
index b6196d7..e95a41b 100644
--- a/modules/system/systemctl-tui/default.nix
+++ b/modules/system/systemctl-tui/default.nix
@@ -8,7 +8,12 @@
 {
   options.system.systemctl-tui = {
     enable = lib.mkEnableOption "Enables systemctl-tui.";
-    package = lib.mkPackageOption pkgs "systemctl-tui" { };
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = pkgs.systemctl-tui;
+      description = "The systemctl-tui package to use.";
+    };
   };
 
   config = lib.mkIf config.system.systemctl-tui.enable {