From 92e39406449cf431c6c2543c99003d388725042e Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Tue, 13 Jan 2026 20:56:55 -0500 Subject: [PATCH] chore: Run nix fmt --- fleet/default.nix | 2 +- fleet/user-config.nix | 42 +++++++++++++++++----------------- installer/artifacts.nix | 2 +- lib/mkFleet.nix | 10 ++++++-- parts/nixos-configurations.nix | 10 +++++++- parts/packages.nix | 10 +++++++- 6 files changed, 49 insertions(+), 27 deletions(-) diff --git a/fleet/default.nix b/fleet/default.nix index 4d7c708..25d8e40 100644 --- a/fleet/default.nix +++ b/fleet/default.nix @@ -3,7 +3,7 @@ lib, config, self ? null, - users ? {}, + users ? { }, ... }: diff --git a/fleet/user-config.nix b/fleet/user-config.nix index 2baead4..199fa4c 100644 --- a/fleet/user-config.nix +++ b/fleet/user-config.nix @@ -40,27 +40,27 @@ in enabledAccounts = lib.filterAttrs (_: user: user.enable) config.athenix.users; in lib.mapAttrs ( - name: user: - let - isPlasma6 = config.services.desktopManager.plasma6.enable; - defaultPackages = lib.optionals (isPlasma6 && name != "root") [ pkgs.kdePackages.kate ]; - finalPackages = lib.subtractLists user.excludePackages (defaultPackages ++ user.extraPackages); - shells = { - bash = pkgs.bash; - zsh = pkgs.zsh; - fish = pkgs.fish; - tcsh = pkgs.tcsh; - }; - in - rec { - isNormalUser = user.isNormalUser; - inherit (user) extraGroups hashedPassword; - description = if user.description != null then user.description else lib.mkDefault ""; - openssh.authorizedKeys.keys = user.opensshKeys; - shell = if user.shell != null then shells.${user.shell} else pkgs.bash; - packages = finalPackages ++ [ shell ]; - } - ) enabledAccounts; + name: user: + let + isPlasma6 = config.services.desktopManager.plasma6.enable; + defaultPackages = lib.optionals (isPlasma6 && name != "root") [ pkgs.kdePackages.kate ]; + finalPackages = lib.subtractLists user.excludePackages (defaultPackages ++ user.extraPackages); + shells = { + bash = pkgs.bash; + zsh = pkgs.zsh; + fish = pkgs.fish; + tcsh = pkgs.tcsh; + }; + in + rec { + isNormalUser = user.isNormalUser; + inherit (user) extraGroups hashedPassword; + description = if user.description != null then user.description else lib.mkDefault ""; + openssh.authorizedKeys.keys = user.opensshKeys; + shell = if user.shell != null then shells.${user.shell} else pkgs.bash; + packages = finalPackages ++ [ shell ]; + } + ) enabledAccounts; # Home Manager configs per user home-manager = { diff --git a/installer/artifacts.nix b/installer/artifacts.nix index c401bcd..6720f61 100644 --- a/installer/artifacts.nix +++ b/installer/artifacts.nix @@ -3,7 +3,7 @@ fleet, self, system, - users ? {}, + users ? { }, }: # 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 .#` diff --git a/lib/mkFleet.nix b/lib/mkFleet.nix index dd55ec5..07f0b1e 100644 --- a/lib/mkFleet.nix +++ b/lib/mkFleet.nix @@ -5,8 +5,14 @@ lib, config, self ? null, - users ? {}, + users ? { }, }: import ../fleet/default.nix { - inherit inputs lib config self users; + inherit + inputs + lib + config + self + users + ; } diff --git a/parts/nixos-configurations.nix b/parts/nixos-configurations.nix index fec0fe8..a0d16a0 100644 --- a/parts/nixos-configurations.nix +++ b/parts/nixos-configurations.nix @@ -14,7 +14,15 @@ flake.nixosConfigurations = let 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 fleet.nixosConfigurations; } diff --git a/parts/packages.nix b/parts/packages.nix index 4098c20..e8c04b1 100644 --- a/parts/packages.nix +++ b/parts/packages.nix @@ -13,7 +13,15 @@ packages = let 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 { inherit inputs