Pr/bump #30

Merged
steveej merged 24 commits from pr/bump into master 2019-12-04 18:40:10 +00:00
4 changed files with 31 additions and 7 deletions
Showing only changes of commit 7ac2f2dc32 - Show all commits

View file

@ -15,6 +15,7 @@
./system.nix
./hw.nix
./pkg.nix
./user.nix
../../profiles/podman/configuration.nix
];

View file

@ -0,0 +1,27 @@
{ config
, pkgs
, ... }:
let
passwords = import ../../../variables/passwords.crypt.nix;
keys = import ../../../variables/keys.nix;
inherit (import ../../lib/default.nix { }) mkUser;
in {
users.extraUsers.steveej2 = mkUser {
uid = 1001;
openssh.authorizedKeys.keys = keys.users.steveej.openssh;
subUidRanges = [{ startUid = 200000; count = 100000; }];
subGidRanges = [{ startGid = 200000; count = 100000; }];
};
users.extraUsers.steveej3 = mkUser {
uid = 1002;
openssh.authorizedKeys.keys = keys.users.steveej.openssh;
shell = pkgs.posh { image = "quay.io/enarx/fedora"; };
subUidRanges = [{ startUid = 300000; count = 100000; }];
subGidRanges = [{ startGid = 300000; count = 100000; }];
};
}

View file

@ -11,6 +11,9 @@ in {
users.extraUsers.root = mkRoot { };
users.extraUsers.steveej = mkUser {
uid = 1000;
subUidRanges = [{ startUid = 100000; count = 100000; }];
subGidRanges = [{ startGid = 100000; count = 100000; }];
};
security.pam.u2f.enable = true;

View file

@ -177,11 +177,4 @@
"${pkgs.runc}/bin/runc"
]
'';
environment.etc."subuid".text = ''
steveej:10000:65536
'';
environment.etc."subgid".text = ''
steveej:10000:65536
'';
}