artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

No more defaultModules

Browse source
This commit is contained in:
Artemis Tosini 2021-11-21 19:35:25 +00:00
parent edc21e7212
commit 45f38ee1a5
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
flake.nix
View file

@ -22,25 +22,24 @@
outputs = { self, nixpkgs, home-manager, rustybar, private, wip-pinebook-pro, ... } @ inputs: outputs = { self, nixpkgs, home-manager, rustybar, private, wip-pinebook-pro, ... } @ inputs:
let let
defaultModules = [ makeSystem = conf: nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate conf
private.nixosModules.base rec {
home-manager.nixosModules.home-manager
{
home-manager.extraSpecialArgs.inputs = inputs;
}
];
makeSystem = conf: nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate
{
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
}; };
} modules = [
conf); private.nixosModules.base
home-manager.nixosModules.home-manager
{
home-manager.extraSpecialArgs = specialArgs;
}
] ++ (conf.modules or [ ]);
});
in in
{ {
nixosConfigurations.starlight = makeSystem { nixosConfigurations.starlight = makeSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = defaultModules ++ [ modules = [
./system/starlight ./system/starlight
private.nixosModules.starlight private.nixosModules.starlight
]; ];
@ -48,21 +47,21 @@
nixosConfigurations.rainbowdash = makeSystem { nixosConfigurations.rainbowdash = makeSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = defaultModules ++ [ modules = [
./system/rainbowdash ./system/rainbowdash
]; ];
}; };
nixosConfigurations.spike = makeSystem { nixosConfigurations.spike = makeSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = defaultModules ++ [ modules = [
./system/spike ./system/spike
]; ];
}; };
nixosConfigurations.mistmane = makeSystem { nixosConfigurations.mistmane = makeSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = defaultModules ++ [ modules = [
./system/mistmane ./system/mistmane
]; ];
}; };

2
home/sway.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, inputs, ... }: { pkgs, lib, config, inputs, ... }:
let let
rustybar = inputs.rustybar.defaultPackage."${pkgs.system}"; rustybar = inputs.rustybar.defaultPackage."${pkgs.system}";
cfg = config.wayland.windowManager.sway; cfg = config.wayland.windowManager.sway;