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: make it possible to use strings for the RC

Browse source 
when providing a string, it will get mapped as if it was given with nivm.dag.entryAnywhere, which will most likely be what people want
This commit is contained in:
n3oney 2023-05-22 15:59:12 +02:00
parent 134c60f40e
commit 5c6cd508c3
No known key found for this signature in database
GPG key ID: C786693DE727850E
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/release-notes/rl-0.4.adoc
View file

@ -16,6 +16,8 @@ https://github.com/n3oney[n3oney]:
* Moved default keybinds into keybinds section of each module
* Simplified luaConfigRC and configRC setting - they can now just take strings
https://github.com/horriblename[horriblename]:
* Added `clangd` as alternative lsp for C/++.

11
modules/core/default.nix
View file

@ -132,13 +132,13 @@ in {
configRC = mkOption {
description = "vimrc contents";
type = nvim.types.dagOf types.lines;
type = types.oneOf [(nvim.types.dagOf types.lines) types.str];
default = {};
};
luaConfigRC = mkOption {
description = "vim lua config";
type = nvim.types.dagOf types.lines;
type = types.oneOf [(nvim.types.dagOf types.lines) types.str];
default = {};
};
@ -282,7 +282,12 @@ in {
dag,
mapResult,
}: let
sortedDag = nvim.dag.topoSort dag;
finalDag = lib.mapAttrs (name: value:
if builtins.isString value
then nvim.dag.entryAnywhere value
else value)
dag;
sortedDag = nvim.dag.topoSort finalDag;
result =
if sortedDag ? result
then mapResult sortedDag.result