Import some dependencies where they are needed

This commit is contained in:
Geoffrey Preud'homme 2024-03-26 16:18:17 +01:00
parent 8d1d15a08e
commit 76a594ca9f
7 changed files with 131 additions and 112 deletions

View file

@ -37,7 +37,7 @@
nur.url = "github:nix-community/NUR";
};
outputs = { self, nixpkgs, disko, nixos-hardware, nix-on-droid, home-manager, stylix, nixvim, nixgl, nur, ... }:
outputs = { self, nixpkgs, disko, nix-on-droid, home-manager, stylix, nixgl, ... }@attrs:
let
nixpkgsConfig = {
overlays = [
@ -54,11 +54,15 @@
lib = {
nixosSystem = { system, modules ? [ ] }: nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = attrs;
modules = modules ++ [
self.nixosModules.dotfiles
{
nixpkgs = nixpkgsConfig;
home-manager.sharedModules = [ self.homeManagerModules.dotfiles ];
home-manager = {
sharedModules = [ self.homeManagerModules.dotfiles ];
extraSpecialArgs = attrs;
};
}
];
};
@ -74,6 +78,7 @@
];
};
homeManagerConfiguration = { system, modules ? [ ] }: home-manager.lib.homeManagerConfiguration {
specialArgs = attrs;
pkgs = import nixpkgs (nixpkgsConfig // {
inherit system;
});
@ -107,8 +112,6 @@
imports = [
./os
disko.nixosModules.disko
home-manager.nixosModules.home-manager
stylix.nixosModules.stylix
];
};
nixOnDroidModules.dotfiles = {
@ -121,8 +124,6 @@
imports = [
./hm
stylix.homeManagerModules.stylix
nixvim.homeManagerModules.nixvim
nur.hmModules.nur
];
};
# Actual configurations
@ -130,28 +131,24 @@
system = "x86_64-linux";
modules = [
./curacao
nixos-hardware.nixosModules.dell-g3-3779
];
};
nixosConfigurations.curacao-usb = lib.nixosSystem {
system = "x86_64-linux";
modules = [
./curacao/usb.nix
nixos-hardware.nixosModules.dell-g3-3779
];
};
nixosConfigurations.pindakaas = lib.nixosSystem {
system = "aarch64-linux";
modules = [
./pindakaas
nixos-hardware.nixosModules.pine64-pinebook-pro
];
};
nixosConfigurations.pindakaas-sd = lib.nixosSystem {
system = "aarch64-linux";
modules = [
./pindakaas/sd.nix
nixos-hardware.nixosModules.pine64-pinebook-pro
];
};
nixOnDroidConfigurations.sprinkles = lib.nixOnDroidConfiguration { };