Add isSystemUser to appease nixpkgs

This commit is contained in:
Artemis Tosini 2021-04-20 00:12:53 +00:00
parent cd12d6a385
commit ee1630b377
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
5 changed files with 10 additions and 3 deletions

@ -1 +1 @@
Subproject commit cbf0667037e6ca16fcc38818b2aa1391de702c6a Subproject commit 6aa6556bcab6dc0f6398b4daa8404d788fd7a6a2

View file

@ -3,7 +3,7 @@
{ {
nix.trustedUsers = [ "build" ]; nix.trustedUsers = [ "build" ];
users.users.build = { users.users.build = {
isNormalUser = false; isSystemUser = true;
home = "/home/build"; home = "/home/build";
createHome = true; createHome = true;
useDefaultShell = true; useDefaultShell = true;

View file

@ -27,6 +27,7 @@
users.users = { users.users = {
artemis.extraGroups = [ "docker" "lxd" "libvirtd" ]; artemis.extraGroups = [ "docker" "lxd" "libvirtd" ];
lxd = { lxd = {
isSystemUser = true;
subUidRanges = [{ startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; }]; subUidRanges = [{ startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; }];
subGidRanges = [{ startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; } { startGid = config.users.groups.artemis.gid; count = 1; }]; subGidRanges = [{ startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; } { startGid = config.users.groups.artemis.gid; count = 1; }];
}; };

View file

@ -1,7 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
net_opts = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=60" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" ]; net_opts = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=60" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" ];
luna_opts = net_opts ++ [ "uid=${builtins.toString config.users.users.artemis.uid}" "gid=100" "credentials=/var/private/luna_creds" ];
in in
{ {
imports = [ ../../externals/systemd-boot-secure ]; imports = [ ../../externals/systemd-boot-secure ];

View file

@ -52,6 +52,13 @@
fileSystems = [ "/" "/media/data" "/media/archive" ]; fileSystems = [ "/" "/media/data" "/media/archive" ];
}; };
# Skye user for luna
users.users.skye = {
isSystemUser = true;
uid = 1001;
extraGroups = [ "users" ];
};
# Packages # Packages
services.tor = { services.tor = {
enable = true; enable = true;