From f11cdb367514db86063f9c2342a7e29d21dac473 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 8 Jul 2024 13:10:07 +0000
Subject: [PATCH 1/4] home: gdb: use 'mkPackageOption'

---
 modules/home/gdb/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/home/gdb/default.nix b/modules/home/gdb/default.nix
index fe8eb69..9e7d81f 100644
--- a/modules/home/gdb/default.nix
+++ b/modules/home/gdb/default.nix
@@ -9,14 +9,7 @@ in
     rr = {
       enable = my.mkDisableOption "rr configuration";
 
-      package = mkOption {
-        type = types.package;
-        default = pkgs.rr;
-        defaultText = literalExample "pkgs.rr";
-        description = ''
-          Package providing rr
-        '';
-      };
+      package = mkPackageOption pkgs "rr" { };
     };
   };
 

From 4943df69ef8015ee0f36ef3997fb60a52d6e7903 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 8 Jul 2024 13:12:21 +0000
Subject: [PATCH 2/4] home: gdb: add 'package' option

---
 modules/home/gdb/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/home/gdb/default.nix b/modules/home/gdb/default.nix
index 9e7d81f..efb49e2 100644
--- a/modules/home/gdb/default.nix
+++ b/modules/home/gdb/default.nix
@@ -6,6 +6,8 @@ in
   options.my.home.gdb = with lib; {
     enable = my.mkDisableOption "gdb configuration";
 
+    package = mkPackageOption pkgs "gdb" { };
+
     rr = {
       enable = my.mkDisableOption "rr configuration";
 
@@ -16,7 +18,7 @@ in
   config = lib.mkIf cfg.enable (lib.mkMerge [
     {
       home.packages = with pkgs; [
-        gdb
+        cfg.package
       ];
 
       xdg = {

From abb78d63e24dadbe6c76af753a9433b44d62d323 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 8 Jul 2024 13:10:28 +0000
Subject: [PATCH 3/4] home: calibre: add 'package' option

---
 modules/home/calibre/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/home/calibre/default.nix b/modules/home/calibre/default.nix
index 6edf654..de7c126 100644
--- a/modules/home/calibre/default.nix
+++ b/modules/home/calibre/default.nix
@@ -5,11 +5,13 @@ in
 {
   options.my.home.calibre = with lib; {
     enable = mkEnableOption "calibre configuration";
+
+    package = mkPackageOption pkgs "calibre" { };
   };
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
-      calibre
+      cfg.package
     ];
   };
 }

From 1644e952435590c2f263624c7e649e91248eae63 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 8 Jul 2024 13:11:30 +0000
Subject: [PATCH 4/4] home: discord: add 'package' option

---
 modules/home/discord/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/home/discord/default.nix b/modules/home/discord/default.nix
index 7348bb4..bfa5d40 100644
--- a/modules/home/discord/default.nix
+++ b/modules/home/discord/default.nix
@@ -7,11 +7,13 @@ in
 {
   options.my.home.discord = with lib; {
     enable = mkEnableOption "discord configuration";
+
+    package = mkPackageOption pkgs "discord" { };
   };
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
-      discord
+      cfg.package
     ];
 
     xdg.configFile."discord/settings.json".source =