kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge packages correctly in flake.nix

Browse Source
This commit is contained in:
Kopatz
2024-11-26 15:20:25 +01:00
parent 00b3958f20
commit e265140d28
2 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
flake.nix
View File

@@ -78,6 +78,9 @@
]; ];
}; };
defaultModules = [ ./modules agenix.nixosModules.default overlays ]; defaultModules = [ ./modules agenix.nixosModules.default overlays ];
merge = list:
builtins.foldl' (acc: elem: nixpkgs.lib.recursiveUpdate acc elem) { }
list;
# helper function to create a machine # helper function to create a machine
mkHost = { modules, specialArgs ? { mkHost = { modules, specialArgs ? {
pkgsVersion = nixpkgs-unstable; pkgsVersion = nixpkgs-unstable;
@@ -86,9 +89,7 @@
let lib = specialArgs.pkgsVersion.lib; let lib = specialArgs.pkgsVersion.lib;
in specialArgs.pkgsVersion.lib.nixosSystem { in specialArgs.pkgsVersion.lib.nixosSystem {
inherit system; inherit system;
modules = modules modules = modules ++ defaultModules ++ lib.lists.optionals (!minimal)
++ defaultModules
++ lib.lists.optionals (!minimal)
[ specialArgs.home-manager-version.nixosModules.home-manager ] [ specialArgs.home-manager-version.nixosModules.home-manager ]
++ lib.lists.optionals (!minimal && graphical) [ ++ lib.lists.optionals (!minimal && graphical) [
./modules/graphical ./modules/graphical
@@ -113,11 +114,11 @@
[ specialArgs.home-manager-version.nixosModules.home-manager ]; [ specialArgs.home-manager-version.nixosModules.home-manager ];
specialArgs = specialArgs // { inherit inputs outputs; }; specialArgs = specialArgs // { inherit inputs outputs; };
}; };
in flake-utils.lib.eachDefaultSystem (system: { customPackages = flake-utils.lib.eachDefaultSystem (system: {
packages = packages =
import ./pkgs { pkgs = nixpkgs-unstable.legacyPackages.${system}; }; import ./pkgs { pkgs = nixpkgs-unstable.legacyPackages.${system}; };
}) // { });
in {
overlays = import ./overlays.nix { inherit inputs; }; overlays = import ./overlays.nix { inherit inputs; };
nixosConfigurations = { nixosConfigurations = {
@@ -192,26 +193,35 @@
"vm" = "vm" =
mkHost { modules = [ ./users/vm ./systems/vm/configuration.nix ]; }; mkHost { modules = [ ./users/vm ./systems/vm/configuration.nix ]; };
# nixos-rebuild switch --flake .#server-vm --target-host root@192.168.0.21 # nixos-rebuild switch --flake .#server-vm --target-host root@192.168.0.21
"server-vm" = "server-vm" = mkHost {
mkHost { modules = [ ./users/anon ./systems/amd-server-vm/configuration.nix ]; }; modules = [ ./users/anon ./systems/amd-server-vm/configuration.nix ];
};
packages.x86_64-linux = {
"server-vm" = nixos-generators.nixosGenerate {
format = "vmware";
system = "x86_64-linux";
#pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux;
specialArgs = {
pkgsVersion = nixpkgs-unstable;
} // {inherit inputs outputs; };
lib = nixpkgs-unstable.legacyPackages.x86_64-linux.lib;
modules = defaultModules ++ [ home-manager-unstable.nixosModules.home-manager ./users/anon ./systems/amd-server-vm/configuration.nix {
# 100G disk;
virtualisation.diskSize = 100 * 1024;
}
];
}; };
}; };
packages = merge [
customPackages.packages
{
x86_64-linux."server-vm" = nixos-generators.nixosGenerate {
format = "vmware";
system = "x86_64-linux";
#pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux;
specialArgs = {
pkgsVersion = nixpkgs-unstable;
} // {
inherit inputs outputs;
};
lib = nixpkgs-unstable.legacyPackages.x86_64-linux.lib;
modules = defaultModules ++ [
home-manager-unstable.nixosModules.home-manager
./users/anon
./systems/amd-server-vm/configuration.nix
{
# 100G disk;
virtualisation.diskSize = 100 * 1024;
}
];
};
}
];
}; };
} }

2
systems/pc/configuration.nix
View File

@@ -48,7 +48,7 @@
ssd.enable = true; ssd.enable = true;
wooting.enable = true; wooting.enable = true;
tpm.enable = true; tpm.enable = true;
#tablet.enable = true; tablet.enable = true;
}; };
graphical = { graphical = {
audio.enable = true; audio.enable = true;