Nebucatnetzer
/
nixos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update all systems to the new mkComputer

This commit is contained in:
Andreas Zweili 2022-01-04 21:17:45 +01:00
parent d44925014e
commit c092bb7b68
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
flake.nix
View File

@ -39,7 +39,7 @@
overlay-unstable
];
};
mkComputer = configurationNix: role: extraModules: nixpkgs.lib.nixosSystem {
mkComputer = configurationNix: homeManagerRole: extraModules: nixpkgs.lib.nixosSystem {
inherit system pkgs;
specialArgs = { inherit system inputs; };
modules = (
@ -54,7 +54,7 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${username}.imports = [ role ];
home-manager.users.${username}.imports = [ homeManagerRole ];
}
] ++ extraModules
);
@ -64,52 +64,27 @@
nixosConfigurations = {
gwyn = mkComputer
./systems/gwyn/configuration.nix
./home-manager/desktop.nix
[
nixos-hardware.nixosModules.dell-precision-5530
nixos-hardware.nixosModules.common-gpu-nvidia
./hardware/bluetooth
./hardware/nvidia
./modules/desktop.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${username} = import ./home-manager/desktop.nix
{
inherit inputs system pkgs;
};
}
];
staubfinger = mkComputer
./systems/staubfinger/configuration.nix
./home-manager/desktop.nix
[
nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-ssd
./hardware/bluetooth
./modules/desktop.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${username} = import ./home-manager/desktop.nix
{
inherit inputs system pkgs;
};
}
];
nixos-vm = mkComputer
./systems/vm/configuration.nix
[
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${username} = import ./home-manager/desktop.nix
{
inherit inputs system pkgs;
};
}
];
./home-manager/desktop.nix
[];
nixos-test-vm = mkComputer
./systems/proxmox-vm/configuration.nix
./home-manager/headless.nix