diff --git a/configs/nixos/modules/desktop/session/waybar.nix b/configs/nixos/modules/desktop/session/waybar.nix
index 5ca28aa..9ad0482 100644
--- a/configs/nixos/modules/desktop/session/waybar.nix
+++ b/configs/nixos/modules/desktop/session/waybar.nix
@@ -21,15 +21,7 @@ let
   modules = lib.attrByPath [ config.networking.hostName ] { } config.registry.waybar;
 in
 {
-  options.modules.desktop.session.waybar = {
-    enable = lib.mkEnableOption "the Waybar status bar";
-
-    package = lib.mkOption {
-      type = lib.types.package;
-      default = pkgs.alexion.waybar;
-      description = "Waybar package used by the status bar.";
-    };
-  };
+  options.modules.desktop.session.waybar.enable = lib.mkEnableOption "the Waybar status bar";
 
   config = lib.mkIf config.modules.desktop.session.waybar.enable {
     # A symbols font backs the module glyphs, so pango falls back to it for the
@@ -38,7 +30,7 @@ in
 
     home-manager.users.${config.user.name}.programs.waybar = {
       enable = true;
-      package = config.modules.desktop.session.waybar.package;
+      package = pkgs.alexion.waybar;
 
       # A user service bound to graphical-session.target, which uwsm activates,
       # so the bar comes up with the session and no compositor exec-once.
diff --git a/configs/nixos/modules/shell/pi/default.nix b/configs/nixos/modules/shell/pi/default.nix
index d5ee5d0..a11653b 100644
--- a/configs/nixos/modules/shell/pi/default.nix
+++ b/configs/nixos/modules/shell/pi/default.nix
@@ -12,21 +12,14 @@ let
   piDir = "${config.users.users.${user}.home}/.pi/agent";
 in
 {
-  options.modules.shell.pi = {
-    enable = lib.mkEnableOption "Pi, a terminal coding agent, configured through home-manager";
-
-    package = lib.mkOption {
-      type = lib.types.package;
-      default = pkgs.alexion.pi-coding-agent;
-      description = "Pi package installed for the primary user.";
-    };
-  };
+  options.modules.shell.pi.enable =
+    lib.mkEnableOption "Pi, a terminal coding agent, configured through home-manager";
 
   config = lib.mkIf config.modules.shell.pi.enable {
     home-manager.users.${user} = {
       programs.pi-coding-agent = {
         enable = true;
-        package = config.modules.shell.pi.package;
+        package = pkgs.alexion.pi-coding-agent;
 
         settings = {
           defaultProvider = "openai-codex";