steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

lib/default: format

Browse source
This commit is contained in:
steveej 2024-01-19 11:49:33 +01:00
parent 9ad9b97298
commit 1bfb2a25ab
1 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

63
nix/os/lib/default.nix
View file

@ -1,35 +1,38 @@
{
lib,
config,
}: let
{ lib
, config
,
}:
let
keys = import ../../variables/keys.nix;
in {
in
{
mkUser = args: (
lib.attrsets.recursiveUpdate {
isNormalUser = true;
extraGroups = [
"docker"
"wheel"
"libvirtd"
"networkmanager"
"vboxusers"
"users"
"input"
"audio"
"video"
"cdrom"
"adbusers"
"dialout"
"cdrom"
];
openssh.authorizedKeys.keys = keys.users.steveej.openssh;
lib.attrsets.recursiveUpdate
{
isNormalUser = true;
extraGroups = [
"docker"
"wheel"
"libvirtd"
"networkmanager"
"vboxusers"
"users"
"input"
"audio"
"video"
"cdrom"
"adbusers"
"dialout"
"cdrom"
];
openssh.authorizedKeys.keys = keys.users.steveej.openssh;
# TODO: investigate why this secret cannot be found
# openssh.authorizedKeys.keyFiles = [
# config.sops.secrets.sharedSshKeys-steveej.path
# ];
}
args
# TODO: investigate why this secret cannot be found
# openssh.authorizedKeys.keyFiles = [
# config.sops.secrets.sharedSshKeys-steveej.path
# ];
}
args
);
disk = rec {
@ -38,7 +41,7 @@ in {
# LVM doesn't allow most characters in VG names
# TODO: replace this with a whitelist for: [a-zA-Z0-9.-_+]
volumeGroup = diskId: builtins.replaceStrings [":"] [""] diskId;
volumeGroup = diskId: builtins.replaceStrings [ ":" ] [ "" ] diskId;
# This is important at install-time
bootGrubDevice = diskId: "/dev/disk/by-id/" + diskId;