chore: Run nix fmt
All checks were successful
CI / Format Check (push) Successful in 2s
CI / Flake Check (push) Successful in 1m35s
CI / Evaluate Key Configurations (nix-builder) (push) Successful in 8s
CI / Evaluate Key Configurations (nix-desktop1) (push) Successful in 7s
CI / Evaluate Key Configurations (nix-laptop1) (push) Successful in 6s
CI / Evaluate Artifacts (installer-iso-nix-laptop1) (push) Successful in 14s
CI / Evaluate Artifacts (lxc-nix-builder) (push) Successful in 8s

This commit is contained in:
UGA Innovation Factory
2026-01-13 20:56:55 -05:00
parent 1c767ed4c8
commit 92e3940644
6 changed files with 49 additions and 27 deletions

View File

@@ -3,7 +3,7 @@
lib, lib,
config, config,
self ? null, self ? null,
users ? {}, users ? { },
... ...
}: }:

View File

@@ -40,27 +40,27 @@ in
enabledAccounts = lib.filterAttrs (_: user: user.enable) config.athenix.users; enabledAccounts = lib.filterAttrs (_: user: user.enable) config.athenix.users;
in in
lib.mapAttrs ( lib.mapAttrs (
name: user: name: user:
let let
isPlasma6 = config.services.desktopManager.plasma6.enable; isPlasma6 = config.services.desktopManager.plasma6.enable;
defaultPackages = lib.optionals (isPlasma6 && name != "root") [ pkgs.kdePackages.kate ]; defaultPackages = lib.optionals (isPlasma6 && name != "root") [ pkgs.kdePackages.kate ];
finalPackages = lib.subtractLists user.excludePackages (defaultPackages ++ user.extraPackages); finalPackages = lib.subtractLists user.excludePackages (defaultPackages ++ user.extraPackages);
shells = { shells = {
bash = pkgs.bash; bash = pkgs.bash;
zsh = pkgs.zsh; zsh = pkgs.zsh;
fish = pkgs.fish; fish = pkgs.fish;
tcsh = pkgs.tcsh; tcsh = pkgs.tcsh;
}; };
in in
rec { rec {
isNormalUser = user.isNormalUser; isNormalUser = user.isNormalUser;
inherit (user) extraGroups hashedPassword; inherit (user) extraGroups hashedPassword;
description = if user.description != null then user.description else lib.mkDefault ""; description = if user.description != null then user.description else lib.mkDefault "";
openssh.authorizedKeys.keys = user.opensshKeys; openssh.authorizedKeys.keys = user.opensshKeys;
shell = if user.shell != null then shells.${user.shell} else pkgs.bash; shell = if user.shell != null then shells.${user.shell} else pkgs.bash;
packages = finalPackages ++ [ shell ]; packages = finalPackages ++ [ shell ];
} }
) enabledAccounts; ) enabledAccounts;
# Home Manager configs per user # Home Manager configs per user
home-manager = { home-manager = {

View File

@@ -3,7 +3,7 @@
fleet, fleet,
self, self,
system, system,
users ? {}, users ? { },
}: }:
# This file defines the logic for generating various build artifacts (ISOs, Netboot, LXC, etc.) # This file defines the logic for generating various build artifacts (ISOs, Netboot, LXC, etc.)
# It exports a set of packages that can be built using `nix build .#<artifact-name>` # It exports a set of packages that can be built using `nix build .#<artifact-name>`

View File

@@ -5,8 +5,14 @@
lib, lib,
config, config,
self ? null, self ? null,
users ? {}, users ? { },
}: }:
import ../fleet/default.nix { import ../fleet/default.nix {
inherit inputs lib config self users; inherit
inputs
lib
config
self
users
;
} }

View File

@@ -14,7 +14,15 @@
flake.nixosConfigurations = flake.nixosConfigurations =
let let
users = config.athenix.users; users = config.athenix.users;
fleet = self.lib.mkFleet { inherit inputs lib config self users; }; fleet = self.lib.mkFleet {
inherit
inputs
lib
config
self
users
;
};
in in
fleet.nixosConfigurations; fleet.nixosConfigurations;
} }

View File

@@ -13,7 +13,15 @@
packages = packages =
let let
users = config.athenix.users; users = config.athenix.users;
fleet = self.lib.mkFleet { inherit inputs lib config self users; }; fleet = self.lib.mkFleet {
inherit
inputs
lib
config
self
users
;
};
artifacts = import ../installer/artifacts.nix { artifacts = import ../installer/artifacts.nix {
inherit inherit
inputs inputs