From 64392b695e6592701e066a99936c4411d0d47efb Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Mon, 23 Mar 2026 21:57:18 +0100 Subject: [PATCH] Fix recursion on self --- features-nixos/global/sops.nix | 4 +-- features-nixos/users/julian/default.nix | 6 ++--- flake.nix | 10 ++++---- hosts/aspi/default.nix | 34 ++++++++++++------------- hosts/builder/default.nix | 14 +++++----- hosts/kardorf/default.nix | 32 +++++++++++------------ overlays/default.nix | 2 +- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/features-nixos/global/sops.nix b/features-nixos/global/sops.nix index c56b93c..fad577e 100644 --- a/features-nixos/global/sops.nix +++ b/features-nixos/global/sops.nix @@ -1,5 +1,5 @@ { - self, + pwd, inputs, config, ... @@ -19,5 +19,5 @@ in { generateKey = false; # TODO: building should not work without secrets!? }; - sops.defaultSopsFile = "${self}/hosts/secrets-common.yaml"; + sops.defaultSopsFile = "${pwd}/hosts/secrets-common.yaml"; } diff --git a/features-nixos/users/julian/default.nix b/features-nixos/users/julian/default.nix index e81d33d..e9db5c0 100644 --- a/features-nixos/users/julian/default.nix +++ b/features-nixos/users/julian/default.nix @@ -1,5 +1,5 @@ { - self, + pwd, pkgs, config, lib, @@ -41,11 +41,11 @@ in { }; sops.secrets.julian-password = { - sopsFile = ../../secrets.yaml; + sopsFile = "${pwd}/hosts/secrets-common.yaml"; neededForUsers = true; }; - home-manager.users.julian = import "${self}/homes/julian/${config.networking.hostName}.nix"; + home-manager.users.julian = import "${pwd}/homes/julian/${config.networking.hostName}.nix"; security.pam.services.swaylock = {}; # Make swaylock unlocking work } diff --git a/flake.nix b/flake.nix index 0cf9ee3..74af966 100644 --- a/flake.nix +++ b/flake.nix @@ -76,10 +76,6 @@ import nixpkgs { inherit system; config.allowUnfree = true; - config.permittedInsecurePackages = [ - "olm-3.2.16" - ]; - warn-dirty = false; } ); in { @@ -89,7 +85,6 @@ homeManagerModules = import ./modules/home-manager; overlays = import ./overlays {inherit inputs outputs;}; - # hydraJobs = import ./hydra.nix { inherit inputs outputs; }; # TODO add hydra jobs here? packages = forEachSystem (pkgs: import ./packages {inherit pkgs;}); devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;}); @@ -103,18 +98,21 @@ ]; specialArgs = { inherit inputs outputs; + pwd = "${self}"; }; }; kardorf = lib.nixosSystem { modules = [./hosts/kardorf]; specialArgs = { inherit inputs outputs; + pwd = "${self}"; }; }; builder = lib.nixosSystem { modules = [./hosts/builder]; specialArgs = { inherit inputs outputs; + pwd = "${self}"; }; }; }; @@ -129,6 +127,7 @@ pkgs = pkgsFor.x86_64-linux; extraSpecialArgs = { inherit inputs outputs; + pwd = "${self}"; }; }; "julian@quickstart" = lib.homeManagerConfiguration { @@ -139,6 +138,7 @@ pkgs = pkgsFor.x86_64-linux; extraSpecialArgs = { inherit inputs outputs; + pwd = "${self}"; }; }; }; diff --git a/hosts/aspi/default.nix b/hosts/aspi/default.nix index a921a30..a66982a 100644 --- a/hosts/aspi/default.nix +++ b/hosts/aspi/default.nix @@ -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"; diff --git a/hosts/builder/default.nix b/hosts/builder/default.nix index 27cec45..7b57cfe 100644 --- a/hosts/builder/default.nix +++ b/hosts/builder/default.nix @@ -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 = [ { diff --git a/hosts/kardorf/default.nix b/hosts/kardorf/default.nix index ac41a30..be19f63 100644 --- a/hosts/kardorf/default.nix +++ b/hosts/kardorf/default.nix @@ -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"; diff --git a/overlays/default.nix b/overlays/default.nix index 8247684..fc4462a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -22,7 +22,7 @@ }; # Adds my custom packages, available as pkgs.frajul.xyz - my-pkgs = final: prev: {frajul = import ../pkgs {pkgs = final;};}; + frajul-pkgs = final: prev: {frajul = import ../packages {pkgs = final;};}; nixpkgs-stable-unstable = final: prev: { unstable = import inputs.nixpkgs-unstable {