diff --git a/modules/home/calibre/default.nix b/modules/home/calibre/default.nix
index de7c126..6edf654 100644
--- a/modules/home/calibre/default.nix
+++ b/modules/home/calibre/default.nix
@@ -5,13 +5,11 @@ in
 {
   options.my.home.calibre = with lib; {
     enable = mkEnableOption "calibre configuration";
-
-    package = mkPackageOption pkgs "calibre" { };
   };
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
-      cfg.package
+      calibre
     ];
   };
 }
diff --git a/modules/home/discord/default.nix b/modules/home/discord/default.nix
index bfa5d40..7348bb4 100644
--- a/modules/home/discord/default.nix
+++ b/modules/home/discord/default.nix
@@ -7,13 +7,11 @@ in
 {
   options.my.home.discord = with lib; {
     enable = mkEnableOption "discord configuration";
-
-    package = mkPackageOption pkgs "discord" { };
   };
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
-      cfg.package
+      discord
     ];
 
     xdg.configFile."discord/settings.json".source =
diff --git a/modules/home/gdb/default.nix b/modules/home/gdb/default.nix
index efb49e2..fe8eb69 100644
--- a/modules/home/gdb/default.nix
+++ b/modules/home/gdb/default.nix
@@ -6,19 +6,24 @@ in
   options.my.home.gdb = with lib; {
     enable = my.mkDisableOption "gdb configuration";
 
-    package = mkPackageOption pkgs "gdb" { };
-
     rr = {
       enable = my.mkDisableOption "rr configuration";
 
-      package = mkPackageOption pkgs "rr" { };
+      package = mkOption {
+        type = types.package;
+        default = pkgs.rr;
+        defaultText = literalExample "pkgs.rr";
+        description = ''
+          Package providing rr
+        '';
+      };
     };
   };
 
   config = lib.mkIf cfg.enable (lib.mkMerge [
     {
       home.packages = with pkgs; [
-        cfg.package
+        gdb
       ];
 
       xdg = {