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

update commonUsers and refactor system config

Browse source
This commit is contained in:
steveej 2024-01-22 22:45:42 +00:00
parent a1f42a13a1
commit 3b7a80ef03
8 changed files with 131 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,35 +6,34 @@ let
keys = import ../../variables/keys.nix;
in
{
mkUser = args: (
lib.attrsets.recursiveUpdate
{
isNormalUser = true;
extraGroups = [
"docker"
"wheel"
"libvirtd"
"networkmanager"
"vboxusers"
"users"
"input"
"audio"
"video"
"cdrom"
"adbusers"
"dialout"
"cdrom"
"fuse"
];
openssh.authorizedKeys.keys = keys.users.steveej.openssh;
mkUser = args: lib.mkMerge [
{
isNormalUser = true;
extraGroups = [
"docker"
"wheel"
"libvirtd"
"networkmanager"
"vboxusers"
"users"
"input"
"audio"
"video"
"cdrom"
"adbusers"
"dialout"
"cdrom"
"fuse"
];
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 {
# TODO: verify the GPT PARTLABEL cap at 36 chars