Fix recursion on self
Some checks failed
Update Nix Flake / update-flake (push) Failing after 12s

This commit is contained in:
2026-03-23 21:57:18 +01:00
parent 8896788bfd
commit 64392b695e
7 changed files with 51 additions and 51 deletions

View File

@@ -1,28 +1,28 @@
{self, ...}: {
{pwd, ...}: {
imports = [
./hardware-configuration.nix
"${self}/features-nixos/global"
"${self}/features-nixos/users/julian"
"${self}/features-nixos/optional/binarycaches.nix"
"${pwd}/features-nixos/global"
"${pwd}/features-nixos/users/julian"
"${pwd}/features-nixos/optional/binarycaches.nix"
"${self}/features-nixos/optional/remote-builder.nix"
"${self}/features-nixos/optional/boot-efi.nix"
"${pwd}/features-nixos/optional/remote-builder.nix"
"${pwd}/features-nixos/optional/boot-efi.nix"
"${self}/features-nixos/optional/greetd.nix"
"${self}/features-nixos/optional/authentication.nix"
"${self}/features-nixos/optional/pcmanfm.nix"
"${self}/features-nixos/optional/pipewire.nix"
"${pwd}/features-nixos/optional/greetd.nix"
"${pwd}/features-nixos/optional/authentication.nix"
"${pwd}/features-nixos/optional/pcmanfm.nix"
"${pwd}/features-nixos/optional/pipewire.nix"
"${self}/features-nixos/optional/gamemode.nix"
"${self}/features-nixos/optional/virtualbox.nix"
"${pwd}/features-nixos/optional/gamemode.nix"
"${pwd}/features-nixos/optional/virtualbox.nix"
"${self}/features-nixos/optional/podman.nix"
"${self}/features-nixos/optional/wireguard.nix"
"${self}/features-nixos/optional/wireshark.nix"
"${self}/features-nixos/optional/flatpak.nix"
"${pwd}/features-nixos/optional/podman.nix"
"${pwd}/features-nixos/optional/wireguard.nix"
"${pwd}/features-nixos/optional/wireshark.nix"
"${pwd}/features-nixos/optional/flatpak.nix"
"${self}/features-nixos/optional/avahi.nix"
"${pwd}/features-nixos/optional/avahi.nix"
];
networking.hostName = "aspi";

View File

@@ -2,7 +2,7 @@
# or
# deploy .#builder
{
self,
pwd,
config,
pkgs,
...
@@ -10,11 +10,11 @@
imports = [
./hardware-configuration.nix
"${self}/features-nixos/global/fish.nix" # fish for admin
"${self}/features-nixos/global/locale.nix"
"${self}/features-nixos/global/nix.nix"
"${self}/features-nixos/global/sops.nix"
"${self}/features-nixos/global/root.nix"
"${pwd}/features-nixos/global/fish.nix" # fish for admin
"${pwd}/features-nixos/global/locale.nix"
"${pwd}/features-nixos/global/nix.nix"
"${pwd}/features-nixos/global/sops.nix"
"${pwd}/features-nixos/global/root.nix"
];
networking.hostName = "builder";
@@ -177,7 +177,7 @@
minimumDiskFreeEvaluator = 4; # in GB
};
# add builder itself as build machine so system emulation is properly supported
# add builder itpwd as build machine so system emulation is properly supported
# nix.distributedBuilds = true;
nix.buildMachines = [
{

View File

@@ -1,31 +1,31 @@
{
self,
pwd,
pkgs,
...
}: {
imports = [
./hardware-configuration.nix
"${self}/features-nixos/global"
"${self}/features-nixos/users/julian"
"${self}/features-nixos/users/wolfi"
"${self}/features-nixos/optional/binarycaches.nix"
"${pwd}/features-nixos/global"
"${pwd}/features-nixos/users/julian"
"${pwd}/features-nixos/users/wolfi"
"${pwd}/features-nixos/optional/binarycaches.nix"
"${self}/features-nixos/optional/remote-builder.nix"
"${self}/features-nixos/optional/boot-efi.nix"
"${pwd}/features-nixos/optional/remote-builder.nix"
"${pwd}/features-nixos/optional/boot-efi.nix"
"${self}/features-nixos/optional/greetd.nix"
"${self}/features-nixos/optional/authentication.nix"
"${self}/features-nixos/optional/pcmanfm.nix"
"${self}/features-nixos/optional/pipewire.nix"
"${pwd}/features-nixos/optional/greetd.nix"
"${pwd}/features-nixos/optional/authentication.nix"
"${pwd}/features-nixos/optional/pcmanfm.nix"
"${pwd}/features-nixos/optional/pipewire.nix"
"${self}/features-nixos/optional/openssh.nix"
"${pwd}/features-nixos/optional/openssh.nix"
"${self}/features-nixos/optional/virtualbox.nix"
"${pwd}/features-nixos/optional/virtualbox.nix"
"${self}/features-nixos/optional/podman.nix"
"${self}/features-nixos/optional/wireshark.nix"
"${self}/features-nixos/optional/flatpak.nix"
"${pwd}/features-nixos/optional/podman.nix"
"${pwd}/features-nixos/optional/wireshark.nix"
"${pwd}/features-nixos/optional/flatpak.nix"
];
networking.hostName = "kardorf";