From f43d436602385ba665c58b04ef593746344baa14 Mon Sep 17 00:00:00 2001 From: = Date: Sun, 31 Mar 2024 19:50:11 -0500 Subject: [PATCH] fix setting --- flake.nix | 62 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/flake.nix b/flake.nix index bbbc868..4665810 100644 --- a/flake.nix +++ b/flake.nix @@ -41,42 +41,44 @@ usersDir = ./users; }; - ypkgs = nypkgs.legacyPackages.${settings.system.architecture}; + ypkgs = nypkgs.legacyPackages.x86_64-linux; ylib = ypkgs.lib; in { nixosConfigurations = { - gpdPocket3 = nixosSystem { - system = "x86_64-linux"; + gpdPocket3 = nixosSystem { + system = "x86_64-linux"; modules = [ ./systems/_common/configuration.nix ./systems/gpdPocket3/configuration.nix ]; - specialArgs = inputs // { inherit ylib; - settings = sett // { - system = { - # TODO remove these probably not needed anymore with per machine specified here - hostname = "gpdPocket3"; - architecture = "x86_64-linux"; - timeZone = "America/Chicago"; # TODO roaming? - defaultLocale = "en_US.UTF-8"; - }; - }; - }; - }; - joe = nixosSystem { - system = "x86_64-linux"; + specialArgs = inputs // { + inherit ylib; + settings = sett // { + system = { + # TODO remove these probably not needed anymore with per machine specified here + hostname = "gpdPocket3"; + architecture = "x86_64-linux"; + timeZone = "America/Chicago"; # TODO roaming? + defaultLocale = "en_US.UTF-8"; + }; + }; + }; + }; + joe = nixosSystem { + system = "x86_64-linux"; modules = [ ./systems/_common/configuration.nix ./systems/joe/configuration.nix ]; - specialArgs = inputs // { inherit ylib; - settings = sett // { - system = { - # TODO remove these probably not needed anymore with per machine specified here - hostname = "joe"; - architecture = "x86_64-linux"; - # TODO remove? - timeZone = "America/Chicago"; - defaultLocale = "en_US.UTF-8"; - }; - }; - }; - }; + specialArgs = inputs // { + inherit ylib; + settings = sett // { + system = { + # TODO remove these probably not needed anymore with per machine specified here + hostname = "joe"; + architecture = "x86_64-linux"; + # TODO remove? + timeZone = "America/Chicago"; + defaultLocale = "en_US.UTF-8"; + }; + }; + }; + }; }; # homeConfigurations = { }; };