From ecfa870c7a37fdc4c50ff4efc73faa42bc1b8660 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Thu, 9 Mar 2023 13:03:50 +0000 Subject: [PATCH] bugfix: Set default for `programs.nixvim`. (#234) fixes #224 --- modules/colorscheme.nix | 4 ++-- wrappers/darwin.nix | 1 + wrappers/hm.nix | 1 + wrappers/nixos.nix | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/colorscheme.nix b/modules/colorscheme.nix index cfebe94d..76f5488c 100644 --- a/modules/colorscheme.nix +++ b/modules/colorscheme.nix @@ -12,8 +12,8 @@ with lib; { }; }; - config = { - extraConfigVim = optionalString (config.colorscheme != "" && config.colorscheme != null) '' + config = mkIf (config.colorscheme != "" && config.colorscheme != null) { + extraConfigVim = '' colorscheme ${config.colorscheme} ''; }; diff --git a/wrappers/darwin.nix b/wrappers/darwin.nix index d2be007f..258d3a38 100644 --- a/wrappers/darwin.nix +++ b/wrappers/darwin.nix @@ -10,6 +10,7 @@ modules: { in { options = { programs.nixvim = mkOption { + default = {}; type = types.submodule ((modules pkgs) ++ [ { diff --git a/wrappers/hm.nix b/wrappers/hm.nix index 1f8032d8..476bec94 100644 --- a/wrappers/hm.nix +++ b/wrappers/hm.nix @@ -10,6 +10,7 @@ modules: { in { options = { programs.nixvim = mkOption { + default = {}; type = types.submodule ((modules pkgs) ++ [ { diff --git a/wrappers/nixos.nix b/wrappers/nixos.nix index 41c7df21..1341f8b4 100644 --- a/wrappers/nixos.nix +++ b/wrappers/nixos.nix @@ -10,6 +10,7 @@ modules: { in { options = { programs.nixvim = mkOption { + default = {}; type = types.submodule ((modules pkgs) ++ [ {