fix: Remove unused or broken config outputs for nix eval of flake components
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 / Build and Publish Documentation (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 / Build and Publish Documentation (push) Has been cancelled
CI / Format Check (push) Has been cancelled
This commit is contained in:
125
fleet/common.nix
125
fleet/common.nix
@@ -14,18 +14,141 @@ let
|
|||||||
# Import all hardware modules so they're available for enabling
|
# Import all hardware modules so they're available for enabling
|
||||||
hwTypes = import ../hw { inherit inputs; };
|
hwTypes = import ../hw { inherit inputs; };
|
||||||
hwModules = lib.attrValues hwTypes;
|
hwModules = lib.attrValues hwTypes;
|
||||||
|
|
||||||
|
# User account submodule definition
|
||||||
|
userSubmodule = lib.types.submodule {
|
||||||
|
options = {
|
||||||
|
enable = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Whether this user account is enabled on this system.";
|
||||||
|
};
|
||||||
|
isNormalUser = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Whether this is a normal user account (vs system user).";
|
||||||
|
};
|
||||||
|
description = lib.mkOption {
|
||||||
|
type = lib.types.nullOr lib.types.str;
|
||||||
|
default = null;
|
||||||
|
description = "Full name or description of the user (GECOS field).";
|
||||||
|
example = "John Doe";
|
||||||
|
};
|
||||||
|
extraGroups = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.str;
|
||||||
|
default = [ ];
|
||||||
|
description = "Additional groups for the user (wheel, docker, etc.).";
|
||||||
|
};
|
||||||
|
hashedPassword = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "!";
|
||||||
|
description = "Hashed password for the user account. Default '!' means locked.";
|
||||||
|
};
|
||||||
|
extraPackages = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.package;
|
||||||
|
default = [ ];
|
||||||
|
description = "Additional system packages available to this user.";
|
||||||
|
};
|
||||||
|
excludePackages = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.package;
|
||||||
|
default = [ ];
|
||||||
|
description = "System packages to exclude for this user.";
|
||||||
|
};
|
||||||
|
homePackages = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.package;
|
||||||
|
default = [ ];
|
||||||
|
description = "Packages to install in the user's home-manager profile.";
|
||||||
|
};
|
||||||
|
extraImports = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.path;
|
||||||
|
default = [ ];
|
||||||
|
description = "Additional home-manager modules to import for this user.";
|
||||||
|
};
|
||||||
|
external = lib.mkOption {
|
||||||
|
type = lib.types.nullOr (
|
||||||
|
lib.types.oneOf [
|
||||||
|
lib.types.path
|
||||||
|
(lib.types.submodule {
|
||||||
|
options = {
|
||||||
|
url = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = "Git repository URL to fetch user configuration from.";
|
||||||
|
};
|
||||||
|
rev = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = "Git commit hash, tag, or branch to fetch.";
|
||||||
|
};
|
||||||
|
submodules = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Whether to fetch Git submodules.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
]
|
||||||
|
);
|
||||||
|
default = null;
|
||||||
|
description = "External dotfiles repository (user.nix + optional nixos.nix).";
|
||||||
|
};
|
||||||
|
opensshKeys = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.str;
|
||||||
|
default = [ ];
|
||||||
|
description = "SSH public keys for the user (authorized_keys).";
|
||||||
|
};
|
||||||
|
shell = lib.mkOption {
|
||||||
|
type = lib.types.nullOr (
|
||||||
|
lib.types.enum [
|
||||||
|
"bash"
|
||||||
|
"zsh"
|
||||||
|
"fish"
|
||||||
|
"tcsh"
|
||||||
|
]
|
||||||
|
);
|
||||||
|
default = "bash";
|
||||||
|
description = "Default shell for the user.";
|
||||||
|
};
|
||||||
|
editor = lib.mkOption {
|
||||||
|
type = lib.types.nullOr (
|
||||||
|
lib.types.enum [
|
||||||
|
"vim"
|
||||||
|
"neovim"
|
||||||
|
"emacs"
|
||||||
|
"nano"
|
||||||
|
"code"
|
||||||
|
]
|
||||||
|
);
|
||||||
|
default = "neovim";
|
||||||
|
description = "Default text editor for the user (sets EDITOR).";
|
||||||
|
};
|
||||||
|
useZshTheme = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Whether to apply the system Zsh theme (Oh My Posh).";
|
||||||
|
};
|
||||||
|
useNvimPlugins = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Whether to apply the system Neovim configuration.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./fs.nix
|
./fs.nix
|
||||||
./boot.nix
|
./boot.nix
|
||||||
./user-config.nix
|
./user-config.nix
|
||||||
./fleet-option.nix
|
|
||||||
../sw
|
../sw
|
||||||
inputs.vscode-server.nixosModules.default
|
inputs.vscode-server.nixosModules.default
|
||||||
inputs.nixos-wsl.nixosModules.default
|
inputs.nixos-wsl.nixosModules.default
|
||||||
] ++ hwModules;
|
] ++ hwModules;
|
||||||
|
|
||||||
|
options.athenix.users = lib.mkOption {
|
||||||
|
type = lib.types.attrsOf userSubmodule;
|
||||||
|
default = { };
|
||||||
|
description = "User accounts configuration. Set enable=true for users that should exist on this system.";
|
||||||
|
};
|
||||||
|
|
||||||
options.athenix = {
|
options.athenix = {
|
||||||
forUser = lib.mkOption {
|
forUser = lib.mkOption {
|
||||||
type = lib.types.nullOr lib.types.str;
|
type = lib.types.nullOr lib.types.str;
|
||||||
|
|||||||
Reference in New Issue
Block a user