plugins: remove all use of lib.nixvim.mkPackageOption

plugins/languages/godot.nix

@@ -14,9 +14,9 @@ helpers.vim-plugin.mkVimPlugin {
   maintainers = [ maintainers.GaetanLepage ];
 
   extraOptions = {
-    godotPackage = helpers.mkPackageOption {
-      name = "godot";
-      default = pkgs.godot_4;
+    godotPackage = lib.mkPackageOption pkgs "godot" {
+      nullable = true;
+      default = "godot_4";
     };
   };
 

plugins/languages/lean.nix

@@ -15,9 +15,9 @@ in
 
     package = helpers.mkPluginPackageOption "lean-nvim" pkgs.vimPlugins.lean-nvim;
 
-    leanPackage = helpers.mkPackageOption {
-      name = "lean";
-      default = pkgs.lean4;
+    leanPackage = lib.mkPackageOption pkgs "lean" {
+      nullable = true;
+      default = "lean4";
     };
 
     lsp = helpers.defaultNullOpts.mkNullable (

plugins/languages/ledger.nix

@@ -45,9 +45,8 @@ mkVimPlugin {
     ];
 
   extraOptions = {
-    ledgerPackage = helpers.mkPackageOption {
-      name = "ledger";
-      default = pkgs.ledger;
+    ledgerPackage = lib.mkPackageOption pkgs "ledger" {
+      nullable = true;
     };
   };
 

plugins/languages/markdown/glow.nix

@@ -72,13 +72,8 @@ helpers.neovim-plugin.mkNeovimPlugin {
   };
 
   extraOptions = {
-    glowPackage = helpers.mkPackageOption {
-      description = ''
-        Which package to use for `glow` in your `$PATH`.
-        Set to `null` to disable its automatic installation.
-      '';
-      default = pkgs.glow;
-      defaultText = lib.literalExpression "pkgs.glow";
+    glowPackage = lib.mkPackageOption pkgs "glow" {
+      nullable = true;
     };
   };
 

plugins/languages/rust/rust-tools.nix

@@ -13,9 +13,8 @@ in
   options.plugins.rust-tools = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "rust tools plugins";
     package = helpers.mkPluginPackageOption "rust-tools" pkgs.vimPlugins.rust-tools-nvim;
-    serverPackage = helpers.mkPackageOption {
-      name = "rust-analyzer";
-      default = pkgs.rust-analyzer;
+    serverPackage = lib.mkPackageOption pkgs "rust-analyzer" {
+      nullable = true;
     };
 
     executor = helpers.defaultNullOpts.mkEnumFirstDefault [

plugins/languages/rust/rustaceanvim/default.nix

@@ -16,9 +16,8 @@ helpers.neovim-plugin.mkNeovimPlugin {
   optionsRenamedToSettings = import ./renamed-options.nix;
 
   extraOptions = {
-    rustAnalyzerPackage = helpers.mkPackageOption {
-      name = "rust-analyzer";
-      default = pkgs.rust-analyzer;
+    rustAnalyzerPackage = lib.mkPackageOption pkgs "rust-analyzer" {
+      nullable = true;
     };
   };
 

plugins/languages/texpresso.nix

@@ -15,9 +15,8 @@ helpers.vim-plugin.mkVimPlugin {
   maintainers = [ maintainers.nickhu ];
 
   extraOptions = {
-    texpressoPackage = helpers.mkPackageOption {
-      name = "texpresso";
-      default = pkgs.texpresso;
+    texpressoPackage = lib.mkPackageOption pkgs "texpresso" {
+      nullable = true;
     };
   };
 

plugins/languages/vimtex.nix

@@ -54,9 +54,13 @@ helpers.vim-plugin.mkVimPlugin {
   };
 
   extraOptions = {
-    texlivePackage = helpers.mkPackageOption {
-      name = "texlive";
-      default = pkgs.texlive.combined.scheme-medium;
+    texlivePackage = lib.mkPackageOption pkgs "texlive" {
+      nullable = true;
+      default = [
+        "texlive"
+        "combined"
+        "scheme-medium"
+      ];
     };
   };