treewide: use mkPackageOption

modules/programs/alacritty.nix

@@ -10,12 +10,7 @@ in {
     programs.alacritty = {
       enable = mkEnableOption "Alacritty";
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "alacritty" { };
-        type = types.package;
-        default = pkgs.alacritty;
-        defaultText = literalExpression "pkgs.alacritty";
-        description = "The Alacritty package to install.";
-      };
 
       settings = mkOption {
         type = tomlFormat.type;

modules/programs/eclipse.nix

@@ -13,14 +13,9 @@ in {
     programs.eclipse = {
       enable = mkEnableOption "Eclipse";
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "eclipse" {
-        type = types.package;
+        default = [ "eclipses" "eclipse-platform" ];
-        default = pkgs.eclipses.eclipse-platform;
+        example = "pkgs.eclipses.eclipse-java";
-        defaultText = literalExpression "pkgs.eclipses.eclipse-platform";
-        example = literalExpression "pkgs.eclipses.eclipse-java";
-        description = ''
-          The Eclipse package to install.
-        '';
       };
 
       enableLombok = mkOption {

modules/programs/eww.nix

@@ -13,15 +13,7 @@ in {
   options.programs.eww = {
     enable = mkEnableOption "eww";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "eww" { };
-      type = types.package;
-      default = pkgs.eww;
-      defaultText = literalExpression "pkgs.eww";
-      example = literalExpression "pkgs.eww";
-      description = ''
-        The eww package to install.
-      '';
-    };
 
     configDir = mkOption {
       type = types.nullOr types.path;

modules/programs/fish.nix

@@ -254,14 +254,7 @@ in {
     programs.fish = {
       enable = mkEnableOption "fish, the friendly interactive shell";
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "fish" { };
-        type = types.package;
-        default = pkgs.fish;
-        defaultText = literalExpression "pkgs.fish";
-        description = ''
-          The fish package to install. May be used to change the version.
-        '';
-      };
 
       generateCompletions = mkEnableOption
         "the automatic generation of completions based upon installed man pages"

modules/programs/foot.nix

@@ -13,12 +13,7 @@ in {
   options.programs.foot = {
     enable = mkEnableOption "Foot terminal";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "foot" { };
-      type = types.package;
-      default = pkgs.foot;
-      defaultText = literalExpression "pkgs.foot";
-      description = "The foot package to install";
-    };
 
     server.enable = mkEnableOption "Foot terminal server";
 

modules/programs/git.nix

@@ -76,12 +76,10 @@ in {
     programs.git = {
       enable = mkEnableOption "Git";
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "git" {
-        type = types.package;
+        example = "pkgs.gitFull";
-        default = pkgs.git;
+        extraDescription = ''
-        defaultText = literalExpression "pkgs.git";
+          Use {var}`pkgs.gitFull`
-        description = ''
-          Git package to install. Use {var}`pkgs.gitAndTools.gitFull`
           to gain access to {command}`git send-email` for instance.
         '';
       };

modules/programs/ion.nix

@@ -14,14 +14,7 @@ in {
   options.programs.ion = {
     enable = mkEnableOption "the Ion Shell. Compatible with Redox and Linux";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "ion" { };
-      type = types.package;
-      default = pkgs.ion;
-      defaultText = literalExpression "pkgs.ion";
-      description = ''
-        The ion package to install. May be used to change the version.
-      '';
-    };
 
     initExtra = mkOption {
       type = types.lines;

modules/programs/java.nix

@@ -21,14 +21,9 @@ in {
         '';
       };
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "java" {
-        type = types.package;
+        default = "jdk";
-        default = pkgs.jdk;
+        example = "pkgs.jre";
-        defaultText = "pkgs.jdk";
-        description = ''
-          Java package to install. Typical values are
-          `pkgs.jdk` or `pkgs.jre`.
-        '';
       };
     };
   };

modules/programs/keychain.nix

@@ -21,14 +21,7 @@ in {
   options.programs.keychain = {
     enable = mkEnableOption "keychain";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "keychain" { };
-      type = types.package;
-      default = pkgs.keychain;
-      defaultText = literalExpression "pkgs.keychain";
-      description = ''
-        Keychain package to install.
-      '';
-    };
 
     keys = mkOption {
       type = types.listOf types.str;

modules/programs/kitty.nix

@@ -89,14 +89,7 @@ in {
   options.programs.kitty = {
     enable = mkEnableOption "Kitty terminal emulator";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "kitty" { };
-      type = types.package;
-      default = pkgs.kitty;
-      defaultText = literalExpression "pkgs.kitty";
-      description = ''
-        Kitty package to install.
-      '';
-    };
 
     darwinLaunchOptions = mkOption {
       type = types.nullOr (types.listOf types.str);

modules/programs/mangohud.nix

@@ -28,12 +28,7 @@ in {
     programs.mangohud = {
       enable = mkEnableOption "Mangohud";
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "mangohud" { };
-        type = types.package;
-        default = pkgs.mangohud;
-        defaultText = literalExpression "pkgs.mangohud";
-        description = "The Mangohud package to install.";
-      };
 
       enableSessionWide = mkOption {
         type = types.bool;

modules/programs/mercurial.nix

@@ -14,12 +14,7 @@ in {
     programs.mercurial = {
       enable = mkEnableOption "Mercurial";
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "mercurial" { };
-        type = types.package;
-        default = pkgs.mercurial;
-        defaultText = literalExpression "pkgs.mercurial";
-        description = "Mercurial package to install.";
-      };
 
       userName = mkOption {
         type = types.str;

modules/programs/mods.nix

@@ -10,12 +10,7 @@ in {
   options.programs.mods = {
     enable = mkEnableOption "mods";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "mods" { };
-      type = types.package;
-      default = pkgs.mods;
-      defaultText = literalExpression "pkgs.mods";
-      description = "The mods package to install";
-    };
 
     settings = mkOption {
       type = yamlFormat.type;

modules/programs/obs-studio.nix

@@ -13,14 +13,7 @@ in {
     programs.obs-studio = {
       enable = mkEnableOption "obs-studio";
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "obs-studio" { };
-        type = types.package;
-        default = pkgs.obs-studio;
-        defaultText = literalExpression "pkgs.obs-studio";
-        description = ''
-          OBS Studio package to install.
-        '';
-      };
 
       finalPackage = mkOption {
         type = types.package;

modules/programs/opam.nix

@@ -12,12 +12,7 @@ in {
   options.programs.opam = {
     enable = mkEnableOption "Opam";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "opam" { };
-      type = types.package;
-      default = pkgs.opam;
-      defaultText = literalExpression "pkgs.opam";
-      description = "Opam package to install.";
-    };
 
     enableBashIntegration =
       lib.hm.shell.mkBashIntegrationOption { inherit config; };

modules/programs/pqiv.nix

@@ -11,12 +11,7 @@ in {
   options.programs.pqiv = {
     enable = mkEnableOption "pqiv image viewer";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "pqiv" { };
-      type = types.package;
-      default = pkgs.pqiv;
-      defaultText = literalExpression "pkgs.pqiv";
-      description = "The pqiv package to install.";
-    };
 
     settings = mkOption {
       type = iniFormat.type;

modules/programs/qutebrowser.nix

@@ -41,12 +41,7 @@ in {
   options.programs.qutebrowser = {
     enable = mkEnableOption "qutebrowser";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "qutebrowser" { };
-      type = types.package;
-      default = pkgs.qutebrowser;
-      defaultText = literalExpression "pkgs.qutebrowser";
-      description = "Qutebrowser package to install.";
-    };
 
     aliases = mkOption {
       type = types.attrsOf types.str;

modules/programs/swayimg.nix

@@ -8,12 +8,9 @@ in {
 
   options.programs.swayimg = {
     enable = lib.mkEnableOption "swayimg";
-    package = lib.mkOption {
+
-      type = lib.types.package;
+    package = lib.mkPackageOption pkgs "swayimg" { };
-      default = pkgs.swayimg;
+
-      defaultText = lib.literalExpression "pkgs.swayimg";
-      description = "The swayimg package to install";
-    };
     settings = lib.mkOption {
       type = iniFormat.type;
       default = { };

modules/programs/terminator.nix

@@ -33,12 +33,7 @@ in {
   options.programs.terminator = {
     enable = mkEnableOption "terminator, a tiling terminal emulator";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "terminator" { };
-      type = types.package;
-      default = pkgs.terminator;
-      example = literalExpression "pkgs.terminator";
-      description = "terminator package to install.";
-    };
 
     config = mkOption {
       default = { };

modules/programs/tint2.nix

@@ -13,12 +13,7 @@ in {
     enable =
       mkEnableOption "tint2, a simple, unobtrusive and light panel for Xorg";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "tint2" { };
-      type = types.package;
-      default = pkgs.tint2;
-      defaultText = literalExpression "pkgs.tint2";
-      description = "Tint2 package to install.";
-    };
 
     extraConfig = mkOption {
       type = types.lines;

modules/programs/tiny.nix

@@ -15,12 +15,7 @@ in {
     programs.tiny = {
       enable = mkEnableOption "tiny, a TUI IRC client written in Rust";
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "tiny" { };
-        type = types.package;
-        default = pkgs.tiny;
-        defaultText = literalExpression "pkgs.tiny";
-        description = "The {command}`tiny` package to install.";
-      };
 
       settings = mkOption {
         type = format.type;

modules/programs/tmate.nix

@@ -13,13 +13,7 @@ in {
     programs.tmate = {
       enable = mkEnableOption "tmate";
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "tmate" { };
-        type = types.package;
-        default = pkgs.tmate;
-        defaultText = literalExpression "pkgs.tmate";
-        example = literalExpression "pkgs.tmate";
-        description = "The tmate package to install.";
-      };
 
       host = mkOption {
         type = with types; nullOr str;

modules/programs/tmux.nix

@@ -226,13 +226,7 @@ in {
         '';
       };
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "tmux" { };
-        type = types.package;
-        default = pkgs.tmux;
-        defaultText = literalExpression "pkgs.tmux";
-        example = literalExpression "pkgs.tmux";
-        description = "The tmux package to install";
-      };
 
       reverseSplit = mkOption {
         default = false;

modules/programs/urxvt.nix

@@ -10,12 +10,7 @@ in {
   options.programs.urxvt = {
     enable = mkEnableOption "rxvt-unicode terminal emulator";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "rxvt-unicode" { };
-      type = types.package;
-      default = pkgs.rxvt-unicode;
-      defaultText = literalExpression "pkgs.rxvt-unicode";
-      description = "rxvt-unicode package to install.";
-    };
 
     fonts = mkOption {
       type = types.listOf types.str;

modules/programs/wezterm.nix

@@ -16,12 +16,7 @@ in {
   options.programs.wezterm = {
     enable = mkEnableOption "wezterm";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "wezterm" { };
-      type = types.package;
-      default = pkgs.wezterm;
-      defaultText = literalExpression "pkgs.wezterm";
-      description = "The Wezterm package to install.";
-    };
 
     extraConfig = mkOption {
       type = types.lines;

modules/programs/zoxide.nix

@@ -9,14 +9,7 @@ in {
   options.programs.zoxide = {
     enable = lib.mkEnableOption "zoxide";
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "zoxide" { };
-      type = lib.types.package;
-      default = pkgs.zoxide;
-      defaultText = lib.literalExpression "pkgs.zoxide";
-      description = ''
-        Zoxide package to install.
-      '';
-    };
 
     options = lib.mkOption {
       type = lib.types.listOf lib.types.str;

modules/services/lorri.nix

@@ -14,12 +14,7 @@ in {
 
     enableNotifications = mkEnableOption "lorri build notifications";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "lorri" { };
-      type = types.package;
-      default = pkgs.lorri;
-      defaultText = literalExpression "pkgs.lorri";
-      description = "Which lorri package to install.";
-    };
 
     nixPackage = mkOption {
       type = types.package;

modules/services/polybar.nix

@@ -72,12 +72,8 @@ in {
     services.polybar = {
       enable = mkEnableOption "Polybar status bar";
 
-      package = mkOption {
+      package = lib.mkPackageOption pkgs "polybar" {
-        type = types.package;
+        example = ''
-        default = pkgs.polybar;
-        defaultText = literalExpression "pkgs.polybar";
-        description = "Polybar package to install.";
-        example = literalExpression ''
           pkgs.polybar.override {
             i3GapsSupport = true;
             alsaSupport = true;

modules/services/swayidle.nix

@@ -49,12 +49,7 @@ in {
   in {
     enable = mkEnableOption "idle manager for Wayland";
 
-    package = mkOption {
+    package = lib.mkPackageOption pkgs "swayidle" { };
-      type = types.package;
-      default = pkgs.swayidle;
-      defaultText = literalExpression "pkgs.swayidle";
-      description = "Swayidle package to install.";
-    };
 
     timeouts = mkOption {
       type = with types; listOf (submodule timeoutModule);