Compare commits

..

5 commits

Author SHA1 Message Date
Ching Pei Yang
eb132eec36
lib: remove anythingConcatLists 2024-12-22 23:15:55 +01:00
Ching Pei Yang
6dc07ba5c1
nixos: use proper submodule type for settings 2024-12-22 23:15:55 +01:00
Ching Pei Yang
da26ea78b2
module: remove redundant code
the bulk of the build step is moved to modules/wrapper/build
2024-12-22 21:59:24 +01:00
Ching Pei Yang
c7f4dd19ca
home-manager: use proper submodule type for settings 2024-12-22 21:58:28 +01:00
Ching Pei Yang
3b73bc0e01
wrapper: add built package as option 2024-12-22 21:49:11 +01:00
4 changed files with 11 additions and 24 deletions

View file

@ -31,10 +31,7 @@
}; };
homeManagerModules = { homeManagerModules = {
nvf = import ./flake/modules/home-manager.nix { nvf = import ./flake/modules/home-manager.nix self.packages lib inputs;
inherit lib inputs;
inherit (self) packages;
};
default = self.homeManagerModules.nvf; default = self.homeManagerModules.nvf;
neovim-flake = neovim-flake =
lib.warn '' lib.warn ''
@ -45,10 +42,7 @@
}; };
nixosModules = { nixosModules = {
nvf = import ./flake/modules/nixos.nix { nvf = import ./flake/modules/nixos.nix self.packages lib inputs;
inherit lib inputs;
inherit (self) packages;
};
default = self.nixosModules.nvf; default = self.nixosModules.nvf;
neovim-flake = neovim-flake =
lib.warn '' lib.warn ''

View file

@ -1,9 +1,5 @@
# Home Manager module # Home Manager module
{ packages: lib: inputs: {
packages,
lib,
inputs,
}: {
config, config,
pkgs, pkgs,
... ...
@ -22,7 +18,9 @@
specialArgs = { specialArgs = {
inherit pkgs lib inputs; inherit pkgs lib inputs;
}; };
modules = import ../../modules/modules.nix {inherit pkgs lib;}; modules = [
{imports = import ../../modules/modules.nix {inherit pkgs lib;};}
];
}; };
in { in {
imports = [ imports = [

View file

@ -1,9 +1,5 @@
# NixOS module # NixOS module
{ packages: lib: inputs: {
packages,
lib,
inputs,
}: {
config, config,
pkgs, pkgs,
... ...
@ -22,7 +18,9 @@
specialArgs = { specialArgs = {
inherit pkgs lib inputs; inherit pkgs lib inputs;
}; };
modules = import ../../modules/modules.nix {inherit pkgs lib;}; modules = [
{imports = import ../../modules/modules.nix {inherit pkgs lib;};}
];
}; };
in { in {
imports = [ imports = [

View file

@ -1,6 +1,3 @@
{ {
imports = [ imports = [./options.nix ./config.nix];
./options.nix
./config.nix
];
} }