fix: Ensure all users are read from and that the config is shared between module levels
Some checks failed
CI / Flake Check (push) Has been cancelled
CI / Evaluate Key Configurations (nix-builder) (push) Has been cancelled
CI / Evaluate Key Configurations (nix-desktop1) (push) Has been cancelled
CI / Evaluate Key Configurations (nix-laptop1) (push) Has been cancelled
CI / Evaluate Artifacts (installer-iso-nix-laptop1) (push) Has been cancelled
CI / Evaluate Artifacts (lxc-nix-builder) (push) Has been cancelled
CI / Format Check (push) Has been cancelled
Some checks failed
CI / Flake Check (push) Has been cancelled
CI / Evaluate Key Configurations (nix-builder) (push) Has been cancelled
CI / Evaluate Key Configurations (nix-desktop1) (push) Has been cancelled
CI / Evaluate Key Configurations (nix-laptop1) (push) Has been cancelled
CI / Evaluate Artifacts (installer-iso-nix-laptop1) (push) Has been cancelled
CI / Evaluate Artifacts (lxc-nix-builder) (push) Has been cancelled
CI / Format Check (push) Has been cancelled
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
inputs,
|
||||
self,
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
@@ -14,7 +13,8 @@
|
||||
|
||||
flake.nixosConfigurations =
|
||||
let
|
||||
fleet = self.lib.mkFleet { inherit inputs lib config; };
|
||||
users = config.athenix.users;
|
||||
fleet = self.lib.mkFleet { inherit inputs lib config self users; };
|
||||
in
|
||||
fleet.nixosConfigurations;
|
||||
}
|
||||
|
||||
@@ -12,13 +12,15 @@
|
||||
lib.mkIf (system == "x86_64-linux") {
|
||||
packages =
|
||||
let
|
||||
fleet = self.lib.mkFleet { inherit inputs lib config; };
|
||||
users = config.athenix.users;
|
||||
fleet = self.lib.mkFleet { inherit inputs lib config self users; };
|
||||
artifacts = import ../installer/artifacts.nix {
|
||||
inherit
|
||||
inputs
|
||||
fleet
|
||||
self
|
||||
system
|
||||
users
|
||||
;
|
||||
};
|
||||
in
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
# Flake-parts wrapper for users.nix
|
||||
{ inputs, ... }:
|
||||
let
|
||||
# Minimal pkgs just for shell paths - will be overridden in actual NixOS configs
|
||||
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
|
||||
in
|
||||
import ../users.nix { inherit pkgs; }
|
||||
Reference in New Issue
Block a user