fix setting

This commit is contained in:
= 2024-03-31 19:50:11 -05:00
parent 970de0bd95
commit f43d436602

View file

@ -41,42 +41,44 @@
usersDir = ./users; usersDir = ./users;
}; };
ypkgs = nypkgs.legacyPackages.${settings.system.architecture}; ypkgs = nypkgs.legacyPackages.x86_64-linux;
ylib = ypkgs.lib; ylib = ypkgs.lib;
in in
{ {
nixosConfigurations = { nixosConfigurations = {
gpdPocket3 = nixosSystem { gpdPocket3 = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ ./systems/_common/configuration.nix ./systems/gpdPocket3/configuration.nix ]; modules = [ ./systems/_common/configuration.nix ./systems/gpdPocket3/configuration.nix ];
specialArgs = inputs // { inherit ylib; specialArgs = inputs // {
settings = sett // { inherit ylib;
system = { settings = sett // {
# TODO remove these probably not needed anymore with per machine specified here system = {
hostname = "gpdPocket3"; # TODO remove these probably not needed anymore with per machine specified here
architecture = "x86_64-linux"; hostname = "gpdPocket3";
timeZone = "America/Chicago"; # TODO roaming? architecture = "x86_64-linux";
defaultLocale = "en_US.UTF-8"; timeZone = "America/Chicago"; # TODO roaming?
}; defaultLocale = "en_US.UTF-8";
}; };
}; };
}; };
joe = nixosSystem { };
system = "x86_64-linux"; joe = nixosSystem {
system = "x86_64-linux";
modules = [ ./systems/_common/configuration.nix ./systems/joe/configuration.nix ]; modules = [ ./systems/_common/configuration.nix ./systems/joe/configuration.nix ];
specialArgs = inputs // { inherit ylib; specialArgs = inputs // {
settings = sett // { inherit ylib;
system = { settings = sett // {
# TODO remove these probably not needed anymore with per machine specified here system = {
hostname = "joe"; # TODO remove these probably not needed anymore with per machine specified here
architecture = "x86_64-linux"; hostname = "joe";
# TODO remove? architecture = "x86_64-linux";
timeZone = "America/Chicago"; # TODO remove?
defaultLocale = "en_US.UTF-8"; timeZone = "America/Chicago";
}; defaultLocale = "en_US.UTF-8";
}; };
}; };
}; };
};
}; };
# homeConfigurations = { }; # homeConfigurations = { };
}; };