diff --git a/flake.nix b/flake.nix index 3f2b4a37..ca7259a5 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,8 @@ }; outputs = - inputs@{ self, flake-parts, ... }: - flake-parts.lib.mkFlake { inherit self inputs; } { + inputs@{ flake-parts, ... }: + flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" "aarch64-linux" diff --git a/infra/flake-part.nix b/infra/flake-part.nix index a154c5bb..f90bd2ff 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -21,7 +21,7 @@ let makeResourceModule = { vmName, isTestVm }: { - _module.args = { inherit self inputs; }; + _module.args = { inherit inputs; }; imports = [ ./common/resource.nix (if isTestVm then ./test-machines + "/${vmName}" else ./machines + "/${vmName}") diff --git a/infra/machines/fedi201/default.nix b/infra/machines/fedi201/default.nix index 2f8978d7..239c85c0 100644 --- a/infra/machines/fedi201/default.nix +++ b/infra/machines/fedi201/default.nix @@ -1,4 +1,10 @@ { + inputs, + config, + pkgs, + ... +}@args: +builtins.trace args { fediversityVm = { vmId = 201; proxmox = "fediversity"; @@ -15,9 +21,10 @@ }; }; - nixos.module = { - imports = [ - ./fedipanel.nix - ]; - }; + # nixos.module = { + # imports = [ + # ./fedipanel.nix + # ]; + # }; + nixos.module = import ./fedipanel.nix { inherit inputs config pkgs; }; } diff --git a/infra/machines/fedi201/fedipanel.nix b/infra/machines/fedi201/fedipanel.nix index 99e02a0e..2b341148 100644 --- a/infra/machines/fedi201/fedipanel.nix +++ b/infra/machines/fedi201/fedipanel.nix @@ -1,5 +1,5 @@ { - self, + inputs, config, pkgs, ... @@ -18,7 +18,7 @@ in }; environment.systemPackages = [ - self + inputs panel ]; @@ -44,7 +44,7 @@ in }; }; systemd.services.${name}.env = { - REPO_DIR = builtins.trace self self; + REPO_DIR = builtins.trace inputs inputs; NIX_DIR = pkgs.nix; }; }