unified common modules

This commit is contained in:
twoneis 2024-01-07 20:46:56 +01:00
parent 75a88af419
commit 337c691528

View file

@ -20,24 +20,23 @@
niri = { niri = {
url = "github:sodiboo/niri-flake"; url = "github:sodiboo/niri-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.niri-src.url = "github:YaLTeR/niri"; inputs.niri-src.url = "github:YaLTeR/niri/v0.1.0-alpha.3";
}; };
}; };
outputs = { nixpkgs, home-manager, nixos-hardware, nur, niri, ... }: outputs = { nixpkgs, home-manager, nixos-hardware, nur, niri, ... }:
{ {
nixosConfigurations = { nixosConfigurations = let
desktop = nixpkgs.lib.nixosSystem { commonModules = [
system = "x86_64-linux";
modules = [
./devices/desktop
./modules/system ./modules/system
niri.nixosModules.default niri.nixosModules.default
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
nixpkgs.overlays = [ nixpkgs.overlays = [
nur.overlay nur.overlay
]; ];
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
@ -45,6 +44,12 @@
}; };
} }
]; ];
in {
desktop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./devices/desktop
] ++ commonModules;
}; };
surface = nixpkgs.lib.nixosSystem { surface = nixpkgs.lib.nixosSystem {
@ -52,20 +57,7 @@
modules = [ modules = [
./devices/surface ./devices/surface
nixos-hardware.nixosModules.microsoft-surface-pro-intel nixos-hardware.nixosModules.microsoft-surface-pro-intel
] ++ commonModules;
./modules/system
niri.nixosModules.default
home-manager.nixosModules.home-manager {
nixpkgs.overlays = [
nur.overlay
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.twoneis = import ./modules/home;
};
}
];
}; };
}; };
}; };