NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-22 21:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify things

Browse source
This commit is contained in:
Mihai Fufezan 2023-02-10 19:39:31 +02:00
parent 885a43f6e7
commit c759ae02f5
No known key found for this signature in database
GPG key ID: 5899325F2F120900
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extra.nix
View file

@ -1,5 +1,5 @@
inputs: let
modulesWithInputs = import ./modules {inherit inputs;};
modulesWithInputs = import ./modules inputs;
neovimConfiguration = {
modules ? [],
@ -10,9 +10,7 @@ inputs: let
}:
modulesWithInputs {
inherit pkgs lib check extraSpecialArgs;
configuration = {...}: {
imports = modules;
};
configuration.imports = modules;
};
mainConfig = isMaximal: {

11
flake.nix
View file

@ -5,19 +5,18 @@
flake-parts,
...
} @ inputs: let
inherit (nixpkgs) lib;
inherit (import ./extra.nix inputs) neovimConfiguration mainConfig;
tidalConfig = {
config.vim.tidal.enable = true;
};
buildPkg = pkgs: modules:
(neovimConfiguration {
inherit pkgs modules;
})
.neovim;
tidalConfig = {
config.vim.tidal.enable = true;
};
nixConfig = mainConfig false;
maximalConfig = mainConfig true;
in
@ -26,7 +25,7 @@
flake = {
lib = {
nvim = (import ./lib/stdlib-extended.nix nixpkgs.lib).nvim;
inherit (import ./lib/stdlib-extended.nix nixpkgs.lib) nvim;
inherit neovimConfiguration;
};

4
modules/default.nix
View file

@ -1,4 +1,4 @@
{inputs}: {
inputs: {
configuration,
pkgs,
lib ? pkgs.lib,
@ -6,7 +6,7 @@
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;