From f2f97d844bb39559f3356e209b49c92900d860b8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 23 Apr 2024 16:41:27 +0200 Subject: [PATCH] misc: allow null in extraPackages --- modules/output.nix | 4 ++-- plugins/git/gitsigns/default.nix | 2 +- plugins/languages/godot.nix | 5 +---- plugins/languages/lean.nix | 2 +- plugins/languages/ledger.nix | 2 +- plugins/languages/rust-tools.nix | 2 +- plugins/languages/rustaceanvim.nix | 5 +---- plugins/languages/treesitter/treesitter.nix | 11 +++++------ plugins/languages/vimtex.nix | 6 ++---- plugins/lsp/helpers.nix | 5 +---- plugins/none-ls/servers.nix | 10 ++++------ plugins/utils/clipboard-image.nix | 5 +---- plugins/utils/todo-comments.nix | 2 +- 13 files changed, 22 insertions(+), 39 deletions(-) diff --git a/modules/output.nix b/modules/output.nix index ae3f1f9d..264c76fb 100644 --- a/modules/output.nix +++ b/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 { diff --git a/plugins/git/gitsigns/default.nix b/plugins/git/gitsigns/default.nix index 4d44ce53..3cab91e3 100644 --- a/plugins/git/gitsigns/default.nix +++ b/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]; }; } diff --git a/plugins/languages/godot.nix b/plugins/languages/godot.nix index 416f2d1f..49e09aee 100644 --- a/plugins/languages/godot.nix +++ b/plugins/languages/godot.nix @@ -36,9 +36,6 @@ with lib; }; extraConfig = cfg: { - extraPackages = - optional - (cfg.godotPackage != null) - cfg.godotPackage; + extraPackages = [cfg.godotPackage]; }; } diff --git a/plugins/languages/lean.nix b/plugins/languages/lean.nix index 4ae75136..3eee0aa4 100644 --- a/plugins/languages/lean.nix +++ b/plugins/languages/lean.nix @@ -252,7 +252,7 @@ in { } ]; - extraPackages = optional (cfg.leanPackage != null) cfg.leanPackage; + extraPackages = [cfg.leanPackage]; extraConfigLua = let setupOptions = with cfg; diff --git a/plugins/languages/ledger.nix b/plugins/languages/ledger.nix index 80d13dcd..9bcccd29 100644 --- a/plugins/languages/ledger.nix +++ b/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 = { diff --git a/plugins/languages/rust-tools.nix b/plugins/languages/rust-tools.nix index 2ac64866..a26a5f93 100644 --- a/plugins/languages/rust-tools.nix +++ b/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 = diff --git a/plugins/languages/rustaceanvim.nix b/plugins/languages/rustaceanvim.nix index df235f9f..6023f472 100644 --- a/plugins/languages/rustaceanvim.nix +++ b/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; diff --git a/plugins/languages/treesitter/treesitter.nix b/plugins/languages/treesitter/treesitter.nix index 1dfbd182..b604af64 100644 --- a/plugins/languages/treesitter/treesitter.nix +++ b/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"; diff --git a/plugins/languages/vimtex.nix b/plugins/languages/vimtex.nix index b22cee37..881e2670 100644 --- a/plugins/languages/vimtex.nix +++ b/plugins/languages/vimtex.nix @@ -87,11 +87,9 @@ with lib; .${cfg.settings.view_method} or []; in - ( - optional - (cfg.texlivePackage != null) + [ cfg.texlivePackage - ) + ] ++ viewerPackages; }; } diff --git a/plugins/lsp/helpers.nix b/plugins/lsp/helpers.nix index ec343fc4..6fa798d0 100644 --- a/plugins/lsp/helpers.nix +++ b/plugins/lsp/helpers.nix @@ -86,10 +86,7 @@ config = mkIf cfg.enable { - extraPackages = - optional - (cfg.package != null) - cfg.package; + extraPackages = [cfg.package]; plugins.lsp.enabledServers = [ { diff --git a/plugins/none-ls/servers.nix b/plugins/none-ls/servers.nix index 49d01b2a..79521890 100644 --- a/plugins/none-ls/servers.nix +++ b/plugins/none-ls/servers.nix @@ -363,11 +363,9 @@ in { ) enabledSources; plugins.gitsigns.enable = mkIf gitsignsEnabled true; - extraPackages = builtins.filter (p: p != null) ( - builtins.map ( - source: source.package or null - ) - enabledSources - ); + extraPackages = + map + (source: source.package or null) + enabledSources; }; } diff --git a/plugins/utils/clipboard-image.nix b/plugins/utils/clipboard-image.nix index 3bcc84a5..51ab754d 100644 --- a/plugins/utils/clipboard-image.nix +++ b/plugins/utils/clipboard-image.nix @@ -134,10 +134,7 @@ in { config = mkIf cfg.enable { extraPlugins = [cfg.package]; - extraPackages = - optional - (cfg.clipboardPackage != null) - cfg.clipboardPackage; + extraPackages = [cfg.clipboardPackage]; extraConfigLua = let setupOptions = diff --git a/plugins/utils/todo-comments.nix b/plugins/utils/todo-comments.nix index 63dea8c7..3952df08 100644 --- a/plugins/utils/todo-comments.nix +++ b/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} '';