diff --git a/flake.nix b/flake.nix index 17dc2d0..a8aef53 100644 --- a/flake.nix +++ b/flake.nix @@ -25,12 +25,9 @@ ./hosts/work-ntb ./hosts/base ]; - specialArgs = { - hostname = "work-ntb"; - }; }; extraSpecialArgs = { - inherit inputs; + inherit (inputs) home-manager nix-flatpak; }; }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; diff --git a/hosts/base/default.nix b/hosts/base/default.nix index d31db67..bb1eebe 100644 --- a/hosts/base/default.nix +++ b/hosts/base/default.nix @@ -6,13 +6,13 @@ config, pkgs, ... -}@extraInputs: +}@inputs: { imports = [ - extraInputs.inputs.nix-flatpak.nixosModules.nix-flatpak # TODO: move to base - extraInputs.inputs.home-manager.nixosModules.home-manager # TODO: move to base + inputs.nix-flatpak.nixosModules.nix-flatpak # TODO: move to base + inputs.home-manager.nixosModules.home-manager # TODO: move to base ]; # Bootloader.