Dehardcoded user configuration.

This commit is contained in:
Kevin Baensch 2019-04-13 00:05:39 +02:00
parent 347d406ea9
commit d2c6b3931e
5 changed files with 38 additions and 19 deletions

View file

@ -1,30 +1,41 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
with lib;
{
users = {
mutableUsers = false;
users.derped = {
let
administrators = user: {
name = user.name;
value = {
isNormalUser = true;
home = "/home/derped";
name = user.name;
uid = user.id;
home = builtins.toPath "/home/${user.name}";
createHome = true;
description = "";
group = "derped";
description = "Administrative user ${user.name}.";
group = user.name;
extraGroups = [ "audio" "wheel" "network" ]
++ (if config.services.xserver.enable then [ "input" ] else [])
++ (if config.services.printing.enable then [ "cups" "lp" ] else [])
++ (if config.virtualisation.docker.enable then [ "docker"] else []);
uid = 1337;
shell = "/run/current-system/sw/bin/zsh";
passwordFile = "/secret/derped";
openssh.authorizedKeys.keyFiles = if config.services.openssh.enable then [ "/secret/derped.pub" ] else [];
shell = "${pkgs.zsh}/bin/zsh";
passwordFile = "/secret/${user.name}";
openssh.authorizedKeys.keyFiles = if config.services.openssh.enable then [ "/secret/${user.name}.pub" ] else [];
};
};
groups.derped = {
name = "derped";
gid = 1337;
members = [ "derped" ];
mkusergroup = user: {
name = user.name;
value = {
name = user.name;
gid = user.id;
members = [ user.name ];
};
};
in {
users = {
mutableUsers = false;
users = listToAttrs (map administrators config.machine.administrators);
groups = listToAttrs (map mkusergroup config.machine.administrators);
};
}

View file

@ -9,6 +9,7 @@ with lib;
config.machine = {
hostName = "CDServer";
administrators = [ { name = "derped"; id = 1337; } ];
allowUnfree = true;
conffiles = [
"etcvars"

View file

@ -11,6 +11,7 @@ with lib;
config.machine = {
allowUnfree = true;
hostName = "Lilim";
administrators = [ { name = "derped"; id = 1337; } ];
conffiles = [
"etcfiles"
"etcvars"
@ -30,7 +31,6 @@ with lib;
"xpkgs"
];
services = [
"containers"
"desktop"
"udev"
"cups"

View file

@ -9,6 +9,7 @@ with lib;
config.machine = {
hostName = "Ophanim";
administrators = [ { name = "derped"; id = 1337; } ];
domain = "ophanim.de";
allowUnfree = true;
conffiles = [

View file

@ -34,6 +34,12 @@ with lib;
The Machines HostName
'';
};
administrators = mkOption {
type = types.listOf types.attrs;
description = ''
List of administrative users.
'';
};
domain = mkOption {
type = types.str;
default = "localhost";