Rename variables

This commit is contained in:
Oliver Davies 2024-02-29 08:26:04 +00:00
parent addad268e5
commit 2f6977bb82
2 changed files with 7 additions and 7 deletions

View file

@ -17,8 +17,8 @@
pkgs = inputs.nixpkgs.legacyPackages.${system}; pkgs = inputs.nixpkgs.legacyPackages.${system};
nixos-system = import ./lib/nixos {inherit inputs pkgs self system username;}; mkNixos = import ./lib/nixos {inherit inputs pkgs self system username;};
wsl-system = import ./lib/wsl2 {inherit inputs pkgs self system username;}; mkWsl = import ./lib/wsl2 {inherit inputs pkgs self system username;};
in in
flake-parts.lib.mkFlake {inherit inputs;} { flake-parts.lib.mkFlake {inherit inputs;} {
systems = ["x86_64-linux"]; systems = ["x86_64-linux"];
@ -37,19 +37,19 @@
flake = { flake = {
nixosConfigurations = { nixosConfigurations = {
apollo = nixos-system { apollo = mkNixos {
desktop = true; desktop = true;
hostname = "apollo"; hostname = "apollo";
}; };
nixedo = nixos-system { nixedo = mkNixos {
desktop = true; desktop = true;
hostname = "nixedo"; hostname = "nixedo";
}; };
}; };
homeConfigurations = { homeConfigurations = {
wsl2 = wsl-system; wsl2 = mkWsl;
}; };
}; };
}; };

View file

@ -9,7 +9,7 @@
hostname, hostname,
}: let }: let
configuration = import ./configuration.nix {inherit desktop hostname inputs pkgs system;}; configuration = import ./configuration.nix {inherit desktop hostname inputs pkgs system;};
hardware-configuration = import ./hardware-configuration.nix; hardwareConfiguration = import ./hardware-configuration.nix;
in in
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
modules = [ modules = [
@ -24,6 +24,6 @@ in
} }
configuration configuration
hardware-configuration hardwareConfiguration
]; ];
} }