diff --git a/infra/flake-part.nix b/infra/flake-part.nix index 0636c692..f90bd2ff 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -141,22 +141,20 @@ in ## - Each normal machine gets a deployment. ## - We add a “default” deployment with all normal machines. ## - We add a “test” deployment with all test machines. - nixops4Deployments = - builtins.trace (builtins.attrNames inputs) genAttrs machines makeDeployment' - // { - default = makeDeployment machines; - test = makeTestDeployment ( - fromJSON ( - let - env = builtins.getEnv "DEPLOYMENT"; - in - if env != "" then - env - else - builtins.trace "env var DEPLOYMENT not set, falling back to ./test-machines/configuration.json!" (readFile ./test-machines/configuration.json) - ) - ); - }; + nixops4Deployments = genAttrs machines makeDeployment' // { + default = makeDeployment machines; + test = makeTestDeployment ( + fromJSON ( + let + env = builtins.getEnv "DEPLOYMENT"; + in + if env != "" then + env + else + builtins.trace "env var DEPLOYMENT not set, falling back to ./test-machines/configuration.json!" (readFile ./test-machines/configuration.json) + ) + ); + }; flake.nixosConfigurations = genAttrs machines (makeConfiguration false) // genAttrs testMachines (makeConfiguration true); diff --git a/infra/machines/fedi201/default.nix b/infra/machines/fedi201/default.nix index 28397a84..9558de9e 100644 --- a/infra/machines/fedi201/default.nix +++ b/infra/machines/fedi201/default.nix @@ -4,7 +4,6 @@ pkgs, ... }: -# builtins.trace args.pkgs { fediversityVm = { vmId = 201; diff --git a/infra/machines/fedi201/fedipanel.nix b/infra/machines/fedi201/fedipanel.nix index 154bd6ea..64e42ca0 100644 --- a/infra/machines/fedi201/fedipanel.nix +++ b/infra/machines/fedi201/fedipanel.nix @@ -1,7 +1,7 @@ { inputs, config, - # pkgs, + pkgs, ... }: let @@ -19,7 +19,7 @@ in }; environment.systemPackages = [ - inputs + inputs.self.outPath panel ]; @@ -45,7 +45,7 @@ in }; }; systemd.services.${name}.environment = { - REPO_DIR = inputs; - # NIX_DIR = pkgs.nix; + REPO_DIR = inputs.self.outPath; + NIX_DIR = pkgs.nix; }; }