From ef63d3477fa3aaecc18512cc48ff4e977449cb4a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 28 May 2024 21:22:35 +0200 Subject: [PATCH] colorschemes: set the colorscheme as mkDefault to allow for overriding --- lib/neovim-plugin.nix | 2 +- lib/vim-plugin.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/neovim-plugin.nix b/lib/neovim-plugin.nix index fbb477a9..cdb76119 100644 --- a/lib/neovim-plugin.nix +++ b/lib/neovim-plugin.nix @@ -118,7 +118,7 @@ rec { require('${luaName}').setup(${toLuaObject cfg.settings}) ''; } - (optionalAttrs (isColorscheme && (colorscheme != null)) { inherit colorscheme; }) + (optionalAttrs (isColorscheme && (colorscheme != null)) { colorscheme = mkDefault colorscheme; }) (extraConfig cfg) ]); }; diff --git a/lib/vim-plugin.nix b/lib/vim-plugin.nix index 23b9511f..3b891213 100644 --- a/lib/vim-plugin.nix +++ b/lib/vim-plugin.nix @@ -105,7 +105,7 @@ with lib; # does this evaluate package? it would not be desired to evaluate package if we use another package. extraPlugins = extraPlugins ++ optional (defaultPackage != null) cfg.package; } - (optionalAttrs (isColorscheme && (colorscheme != null)) { inherit colorscheme; }) + (optionalAttrs (isColorscheme && (colorscheme != null)) { colorscheme = mkDefault colorscheme; }) (extraConfig cfg) ]); };