misc: allow null in extraPackages

modules/output.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  pkgs,
   ...
 }:
 with lib; let
@@ -34,9 +33,10 @@ in {
     };
 
     extraPackages = mkOption {
-      type = types.listOf types.package;
+      type = with types; listOf (nullOr package);
       default = [];
       description = "Extra packages to be made available to neovim";
+      apply = builtins.filter (p: p != null);
     };
 
     extraPython3Packages = mkOption {

plugins/git/gitsigns/default.nix

@@ -150,6 +150,6 @@ with lib;
           `plugins.trouble.enable` is `false`.
           You should maybe enable the `trouble` plugin.
         '';
-      extraPackages = optional (cfg.gitPackage != null) cfg.gitPackage;
+      extraPackages = [cfg.gitPackage];
     };
   }

plugins/languages/godot.nix

@@ -36,9 +36,6 @@ with lib;
     };
 
     extraConfig = cfg: {
-      extraPackages =
+      extraPackages = [cfg.godotPackage];
-        optional
-        (cfg.godotPackage != null)
-        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 =
+    extraPackages = [cfg.rustAnalyzerPackage];
-      optional
-      (cfg.rustAnalyzerPackage != null)
-      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;
+      extraPackages = with pkgs; [
-        [
+        tree-sitter
-          tree-sitter
+        nodejs
-          nodejs
+        cfg.gccPackage
-        ]
+      ];
-        ++ optional (cfg.gccPackage != null) 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;
     };
   }

plugins/lsp/helpers.nix

@@ -86,10 +86,7 @@
       config =
         mkIf cfg.enable
         {
-          extraPackages =
+          extraPackages = [cfg.package];
-            optional
-            (cfg.package != null)
-            cfg.package;
 
           plugins.lsp.enabledServers = [
             {

plugins/none-ls/servers.nix

@@ -363,11 +363,9 @@ in {
         )
         enabledSources;
       plugins.gitsigns.enable = mkIf gitsignsEnabled true;
-      extraPackages = builtins.filter (p: p != null) (
+      extraPackages =
-        builtins.map (
+        map
-          source: source.package or null
+        (source: source.package or null)
-        )
+        enabledSources;
-        enabledSources
-      );
     };
 }

plugins/utils/clipboard-image.nix

@@ -134,10 +134,7 @@ in {
   config = mkIf cfg.enable {
     extraPlugins = [cfg.package];
 
-    extraPackages =
+    extraPackages = [cfg.clipboardPackage];
-      optional
-      (cfg.clipboardPackage != null)
-      cfg.clipboardPackage;
 
     extraConfigLua = let
       setupOptions =

plugins/utils/todo-comments.nix

@@ -271,7 +271,7 @@ in {
   in
     mkIf cfg.enable {
       extraPlugins = [cfg.package];
-      extraPackages = optional (cfg.ripgrepPackage != null) cfg.ripgrepPackage;
+      extraPackages = [cfg.ripgrepPackage];
       extraConfigLua = ''
         require("todo-comments").setup${helpers.toLuaObject setupOptions}
       '';