1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-11-26 04:01:03 +01:00

flake: simplify legacyPackages definitions

- Remove the `makeNixvimWithModule` module arg.
- Move standalone wrapper definitions to `wrappers.nix`
- Move `nixvimConfiguration` alias to `nixvim-configurations.nix`
This commit is contained in:
Matt Sturgeon 2025-11-24 10:58:52 +00:00
parent 947cb0aaed
commit 3dc952d69c
4 changed files with 9 additions and 19 deletions

View file

@ -10,7 +10,6 @@
./flake-modules ./flake-modules
./ci.nix ./ci.nix
./lib.nix ./lib.nix
./legacy-packages.nix
./nixvim-configurations.nix ./nixvim-configurations.nix
./overlays.nix ./overlays.nix
./packages.nix ./packages.nix

View file

@ -1,15 +0,0 @@
{
perSystem =
{
config,
makeNixvimWithModule,
...
}:
{
legacyPackages = rec {
inherit makeNixvimWithModule;
makeNixvim = module: makeNixvimWithModule { inherit module; };
nixvimConfiguration = config.nixvimConfigurations.default;
};
};
}

View file

@ -1,10 +1,12 @@
{ self, ... }: { self, ... }:
{ {
perSystem = perSystem =
{ system, ... }: { config, system, ... }:
{ {
nixvimConfigurations.default = self.lib.evalNixvim { nixvimConfigurations.default = self.lib.evalNixvim {
inherit system; inherit system;
}; };
legacyPackages.nixvimConfiguration = config.nixvimConfigurations.default;
}; };
} }

View file

@ -8,13 +8,17 @@ let
in in
{ {
perSystem = perSystem =
{ system, ... }: { config, system, ... }:
let
inherit (config.legacyPackages) makeNixvimWithModule;
in
{ {
_module.args = { legacyPackages = {
makeNixvimWithModule = import ../wrappers/standalone.nix { makeNixvimWithModule = import ../wrappers/standalone.nix {
inherit lib self; inherit lib self;
defaultSystem = system; defaultSystem = system;
}; };
makeNixvim = module: makeNixvimWithModule { inherit module; };
}; };
}; };