misc: allow null in extraPackages

plugins/languages/godot.nix

@@ -36,9 +36,6 @@ with lib;
     };
 
     extraConfig = cfg: {
-      extraPackages =
-        optional
-        (cfg.godotPackage != null)
-        cfg.godotPackage;
+      extraPackages = [cfg.godotPackage];
     };
   }

plugins/languages/lean.nix

@@ -252,7 +252,7 @@ in {
       }
     ];
 
-    extraPackages = optional (cfg.leanPackage != null) cfg.leanPackage;
+    extraPackages = [cfg.leanPackage];
 
     extraConfigLua = let
       setupOptions = with cfg;

plugins/languages/ledger.nix

@@ -48,7 +48,7 @@ with helpers.vim-plugin;
     };
 
     extraConfig = cfg: {
-      extraPackages = optional (cfg.ledgerPackage != null) cfg.ledgerPackage;
+      extraPackages = [cfg.ledgerPackage];
     };
 
     settingsOptions = {

plugins/languages/rust-tools.nix

@@ -133,7 +133,7 @@ in {
     };
   config = mkIf cfg.enable {
     extraPlugins = with pkgs.vimPlugins; [nvim-lspconfig cfg.package];
-    extraPackages = optional (cfg.serverPackage != null) cfg.serverPackage;
+    extraPackages = [cfg.serverPackage];
 
     plugins.lsp.postConfig = let
       options =

plugins/languages/rustaceanvim.nix

@@ -238,10 +238,7 @@ in {
   config = mkIf cfg.enable {
     extraPlugins = [cfg.package];
 
-    extraPackages =
-      optional
-      (cfg.rustAnalyzerPackage != null)
-      cfg.rustAnalyzerPackage;
+    extraPackages = [cfg.rustAnalyzerPackage];
 
     plugins.lsp.postConfig = let
       globalOptions = with cfg;

plugins/languages/treesitter/treesitter.nix

@@ -213,12 +213,11 @@ in {
         if cfg.nixGrammars
         then [(cfg.package.withPlugins (_: cfg.grammarPackages))]
         else [cfg.package];
-      extraPackages = with pkgs;
-        [
-          tree-sitter
-          nodejs
-        ]
-        ++ optional (cfg.gccPackage != null) cfg.gccPackage;
+      extraPackages = with pkgs; [
+        tree-sitter
+        nodejs
+        cfg.gccPackage
+      ];
 
       opts = mkIf cfg.folding {
         foldmethod = "expr";

plugins/languages/vimtex.nix

@@ -87,11 +87,9 @@ with lib;
           .${cfg.settings.view_method}
           or [];
       in
-        (
-          optional
-          (cfg.texlivePackage != null)
+        [
           cfg.texlivePackage
-        )
+        ]
         ++ viewerPackages;
     };
   }