NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-26 15:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: customizable neovim package

Browse source
This commit is contained in:
raf 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/basic/config.nix
View file

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

10
modules/basic/module.nix
View file

@ -1,11 +1,19 @@
{ {
pkgs,
lib, lib,
config,
... ...
}: }:
with lib; with lib;
with builtins; { with builtins; {
options.vim = { 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 = { debugMode = {
enable = mkEnableOption "debug mode"; enable = mkEnableOption "debug mode";
level = mkOption { level = mkOption {

16
modules/default.nix
View file

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