pinpox/infra
1
0
Fork 0
forked from pub-solar/infra
Code Pull requests Activity

style: avoid usage of top-level "with lib";

Browse source 
See: https://github.com/NixOS/nixpkgs/issues/208242
This commit is contained in:
teutat3s 2024-05-19 15:27:19 +02:00
parent 39221b3874
commit c015a1ec2e
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
4 changed files with 69 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/core/default.nix
View file

@ -13,7 +13,11 @@
./users.nix ./users.nix
]; ];
options.pub-solar-os = with lib; { options.pub-solar-os =
let
inherit (lib) mkOption types;
in
{
adminEmail = mkOption { adminEmail = mkOption {
description = "Email address to use for administrative stuff like ACME"; description = "Email address to use for administrative stuff like ACME";
type = types.str; type = types.str;

6
modules/core/networking.nix
View file

@ -5,7 +5,11 @@
... ...
}: }:
{ {
options.pub-solar-os.networking = with lib; { options.pub-solar-os.networking =
let
inherit (lib) mkOption types;
in
{
domain = mkOption { domain = mkOption {
description = "domain on which all services should run. This defaults to pub.solar"; description = "domain on which all services should run. This defaults to pub.solar";
type = types.str; type = types.str;

6
modules/core/users.nix
View file

@ -6,7 +6,11 @@
... ...
}: }:
{ {
options.pub-solar-os.authentication = with lib; { options.pub-solar-os.authentication =
let
inherit (lib) mkOption types;
in
{
username = mkOption { username = mkOption {
description = "Username for the adminstrative user"; description = "Username for the adminstrative user";
type = types.str; type = types.str;

8
modules/keycloak/default.nix
View file

@ -6,12 +6,12 @@
... ...
}: }:
{ {
options.pub-solar-os.auth = with lib; { options.pub-solar-os.auth = {
enable = mkEnableOption "Enable keycloak to run on the node"; enable = lib.mkEnableOption "Enable keycloak to run on the node";
realm = mkOption { realm = lib.mkOption {
description = "Name of the realm"; description = "Name of the realm";
type = types.str; type = lib.types.str;
default = config.pub-solar-os.networking.domain; default = config.pub-solar-os.networking.domain;
}; };
}; };