feat: customizable neovim package

This commit is contained in:
NotAShelf 2023-08-01 17:28:06 +03:00
parent f0dffff72e
commit fcaed357f4
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
3 changed files with 16 additions and 12 deletions

View file

@ -138,7 +138,7 @@ in {
${optionalString (!cfg.enableEditorconfig) ''
let g:editorconfig = v:false
''}
${optionalString (cfg.spellChecking.enable) ''
${optionalString cfg.spellChecking.enable ''
set spell
set spelllang=${toString cfg.spellChecking.language}
''}

View file

@ -1,11 +1,19 @@
{
pkgs,
lib,
config,
...
}:
with lib;
with builtins; {
options.vim = {
package = mkOption {
type = types.package;
default = pkgs.neovim-unwrapped;
description = ''
The neovim package to use. You will need to use an unwrapped package for this option to work as intended.
'';
};
debugMode = {
enable = mkEnableOption "debug mode";
level = mkOption {

View file

@ -6,7 +6,7 @@ inputs: {
extraSpecialArgs ? {},
}: let
inherit (pkgs) neovim-unwrapped wrapNeovim vimPlugins;
inherit (builtins) map filter isString toString getAttr hasAttr attrNames;
inherit (builtins) map filter isString toString getAttr;
inherit (pkgs.vimUtils) buildVimPluginFrom2Nix;
extendedLib = import ../lib/stdlib-extended.nix lib;
@ -18,11 +18,7 @@ inputs: {
module = extendedLib.evalModules {
modules = [configuration] ++ nvimModules;
specialArgs =
{
modulesPath = toString ./.;
}
// extraSpecialArgs;
specialArgs = {modulesPath = toString ./.;} // extraSpecialArgs;
};
buildPlug = {pname, ...} @ args:
@ -59,9 +55,10 @@ inputs: {
(f: f != null)
plugins);
neovim = wrapNeovim neovim-unwrapped {
viAlias = vimOptions.viAlias;
vimAlias = vimOptions.vimAlias;
neovim = wrapNeovim vimOptions.package {
inherit (vimOptions) viAlias;
inherit (vimOptions) vimAlias;
configure = {
customRC = vimOptions.builtConfigRC;
@ -72,7 +69,6 @@ inputs: {
};
};
in {
imports = [./assertions.nix];
inherit (module) options config;
inherit (module._module.args) pkgs;
inherit neovim;