This commit is contained in:
iFargle 2023-08-23 17:11:24 +09:00
parent 4443cf834f
commit 9f29593d30
2 changed files with 11 additions and 7 deletions

View file

@ -19,8 +19,8 @@
libx = import ./lib { inherit inputs outputs stateVersion; }; libx = import ./lib { inherit inputs outputs stateVersion; };
in { in {
nixosConfigurations = { nixosConfigurations = {
nixos-laptop = libx.mkHost { hostname = "nixos-laptop"; username = "albert"; desktop = "gnome"; }; nixos-laptop = libx.nixosSystem { hostname = "nixos-laptop"; username = "albert"; desktop = "gnome"; };
nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; username = "albert"; desktop = "gnome"; }; nixos-desktop = libx.nixosSystem { hostname = "nixos-desktop"; username = "albert"; desktop = "gnome"; };
}; };
homeConfigurations = { homeConfigurations = {
"albert@nixos-laptop" = libx.mkHome { hostname = "nixos-laptop"; username = "albert"; desktop = "gnome"; }; "albert@nixos-laptop" = libx.mkHome { hostname = "nixos-laptop"; username = "albert"; desktop = "gnome"; };

View file

@ -1,11 +1,13 @@
{ inputs, outputs, stateVersion, ... }: { { inputs, outputs, stateVersion, ... }: {
# Helper function for generating home-manager configs # Helper function for generating home-manager configs
mkHome = { hostname, username, desktop ? null, platform ? "x86_64-linux" }: inputs.home-manager.lib.homeManagerConfiguration { mkHome = { hostname, username, desktop ? null, platform ? "x86_64-linux" }: inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${platform}; # pkgs = inputs.nixpkgs.legacyPackages.${platform};
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs outputs desktop hostname platform username stateVersion; inherit inputs outputs desktop hostname platform username hmStateVersion;
}; };
modules = [ ../home-manager ]; modules = [
../home-manager
];
}; };
# Helper function for generating host configs # Helper function for generating host configs
@ -14,8 +16,10 @@
inherit inputs outputs desktop hostname username stateVersion; inherit inputs outputs desktop hostname username stateVersion;
}; };
modules = [ modules = [
../nixos ../nixos
inputs.agenix.nixosModules.default sops-nix.nixosModules.sops # Handle secrets
lanzaboote.nixosModules.lanzaboote # SecureBoot Configuration
nur.nixosModules.nur # NixOS User Repository
] ++ (inputs.nixpkgs.lib.optionals (installer != null) [ installer ]); ] ++ (inputs.nixpkgs.lib.optionals (installer != null) [ installer ]);
}; };