From bff1b3183cbae1c6cb7ab1e7a53add3efdd83f41 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Tue, 7 Oct 2025 16:51:26 +0000 Subject: [PATCH] Pass authentik-nix through as an input We aren't operating on it, just passing it through, so no need to manually enumerate it on every pass-through point. --- flake.nix | 11 ++++++----- system.nix | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 8b77f38..67837bf 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ timecard-bot.url = "github:Gleipnir-Technology/timecard-bot?rev=8c81b6683f97aa2712323836e629adf102be58ac"; }; - outputs = { self, authentik-nix, disko, home-manager, nixpkgs, nixvim, sops-nix, timecard-bot, ...}: + outputs = inputs@{ self, disko, home-manager, nixpkgs, nixvim, sops-nix, timecard-bot, ...}: let configFiles = pkgs.stdenv.mkDerivation { name = "config-files"; @@ -38,20 +38,21 @@ nixosConfigurations = { corp = import ./system.nix { configuration = ./host/corp/configuration.nix; - inherit authentik-nix configFiles disko home-manager nixpkgs nixvim sops-nix system timecard-bot; + roles = [ ./roles/corp.nix ]; + inherit configFiles disko home-manager inputs nixpkgs nixvim sops-nix system timecard-bot; }; "nocix-amd-legacy-hexcore" = import ./system.nix { configuration = ./host/nocix/amd-legacy-hexcore; roles = [ ./roles/nidus-sync.nix ]; - inherit authentik-nix configFiles disko home-manager nixpkgs nixvim sops-nix system timecard-bot; + inherit configFiles disko home-manager inputs nixpkgs nixvim sops-nix system timecard-bot; }; "sync.nidus.cloud" = import ./system.nix { configuration = ./host/sync/configuration.nix; - inherit authentik-nix configFiles disko home-manager nixpkgs nixvim sops-nix system timecard-bot; + inherit configFiles disko home-manager inputs nixpkgs nixvim sops-nix system timecard-bot; }; test-corp = nixpkgs.lib.nixosSystem { configuration = ./host/test-corp/configuration.nix; - inherit authentik-nix configFiles disko home-manager nixpkgs nixvim sops-nix system timecard-bot; + inherit configFiles disko home-manager inputs nixpkgs nixvim sops-nix system timecard-bot; }; }; }; diff --git a/system.nix b/system.nix index 57242fc..92edd0c 100644 --- a/system.nix +++ b/system.nix @@ -1,4 +1,4 @@ -{ authentik-nix, configFiles, configuration, disko, home-manager, nixpkgs, nixvim, roles, sops-nix, system, timecard-bot, ... }: +{ configFiles, configuration, disko, home-manager, inputs, nixpkgs, nixvim, roles, sops-nix, system, timecard-bot, ... }: let allowed-unfree-packages = [ "corefonts" @@ -6,11 +6,11 @@ let ]; in nixpkgs.lib.nixosSystem { modules = [ - authentik-nix.nixosModules.default + inputs.authentik-nix.nixosModules.default disko.nixosModules.disko home-manager.nixosModules.home-manager { - home-manager.extraSpecialArgs = { inherit configFiles; }; + home-manager.extraSpecialArgs = { inherit configFiles inputs; }; home-manager.sharedModules = [ nixvim.homeManagerModules.nixvim ./modules/home/nixvim.nix @@ -37,7 +37,7 @@ in nixpkgs.lib.nixosSystem { system = "${system}"; }; specialArgs = { - inherit configFiles timecard-bot; + inherit configFiles inputs timecard-bot; }; system = "${system}"; }