From 51e682d66e5506ac7e35b93085a3fcc42b5dcee4 Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Sat, 24 Aug 2024 20:08:51 -0700 Subject: [PATCH] neovim: better default package definition --- home/modules/neovim.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/home/modules/neovim.nix b/home/modules/neovim.nix index b59f09a..03156ce 100644 --- a/home/modules/neovim.nix +++ b/home/modules/neovim.nix @@ -3,7 +3,7 @@ let cfg = config.snowhawk.neovim; - nightlyPackage = inputs.neovim-overlay.packages.${pkgs.system}.default; + nightlyNeovim = inputs.neovim-overlay.packages.${pkgs.system}.default; in { options.snowhawk.neovim = { @@ -11,8 +11,9 @@ in nightly = lib.mkEnableOption "nightly build of neovim"; - package = lib.mkPackageOption pkgs "neovim" { - default = [ "neovim-unwrapped" ]; + package = lib.mkOption { + type = with lib.types; package; + default = if cfg.nightly then nightlyNeovim else pkgs.neovim-unwrapped; }; }; config = @@ -26,8 +27,6 @@ in }; in lib.mkIf cfg.enable { - snowhawk.neovim.package = lib.mkIf cfg.nightly (lib.mkDefault nightlyPackage); - # Set nvim as manpager and default editor home.sessionVariables = { EDITOR = "nvim";