use imputs over self

This commit is contained in:
Kiara Grouwstra 2025-03-12 14:22:32 +01:00
parent ae08673c1b
commit 76ff180ca7
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
4 changed files with 18 additions and 11 deletions

View file

@ -12,8 +12,8 @@
}; };
outputs = outputs =
inputs@{ self, flake-parts, ... }: inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit self inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"

View file

@ -21,7 +21,7 @@ let
makeResourceModule = makeResourceModule =
{ vmName, isTestVm }: { vmName, isTestVm }:
{ {
_module.args = { inherit self inputs; }; _module.args = { inherit inputs; };
imports = [ imports = [
./common/resource.nix ./common/resource.nix
(if isTestVm then ./test-machines + "/${vmName}" else ./machines + "/${vmName}") (if isTestVm then ./test-machines + "/${vmName}" else ./machines + "/${vmName}")

View file

@ -1,4 +1,10 @@
{ {
inputs,
config,
pkgs,
...
}@args:
builtins.trace args {
fediversityVm = { fediversityVm = {
vmId = 201; vmId = 201;
proxmox = "fediversity"; proxmox = "fediversity";
@ -15,9 +21,10 @@
}; };
}; };
nixos.module = { # nixos.module = {
imports = [ # imports = [
./fedipanel.nix # ./fedipanel.nix
]; # ];
}; # };
nixos.module = import ./fedipanel.nix { inherit inputs config pkgs; };
} }

View file

@ -1,5 +1,5 @@
{ {
self, inputs,
config, config,
pkgs, pkgs,
... ...
@ -18,7 +18,7 @@ in
}; };
environment.systemPackages = [ environment.systemPackages = [
self inputs
panel panel
]; ];
@ -44,7 +44,7 @@ in
}; };
}; };
systemd.services.${name}.env = { systemd.services.${name}.env = {
REPO_DIR = builtins.trace self self; REPO_DIR = builtins.trace inputs inputs;
NIX_DIR = pkgs.nix; NIX_DIR = pkgs.nix;
}; };
} }