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

7
nix/os/devices/steveej-t14/system.nix
View file

@ -6,8 +6,6 @@
, ...
}:
let
passwords = import ../../../variables/passwords.crypt.nix;
localTcpPorts = [
22
@ -30,6 +28,7 @@ in
../../snippets/nix-settings-holo-chain.nix
../../snippets/radicale.nix
../../snippets/sway-desktop.nix
../../snippets/timezone.nix
];
nix.settings = {
@ -64,6 +63,8 @@ in
}
];
networking.networkmanager.enable = true;
networking.extraHosts = ''
'';
@ -122,8 +123,6 @@ in
services.xserver.videoDrivers = lib.mkForce [ "amdgpu" ];
time.timeZone = lib.mkForce passwords.timeZone.stefan;
hardware.ledger.enable = true;
# services.zerotierone = {

21
nix/os/devices/steveej-t14/user.nix
View file

@ -1,19 +1,20 @@
{
config,
pkgs,
lib,
...
}: let
{ config
, pkgs
, lib
, ...
}:
let
keys = import ../../../variables/keys.nix;
inherit (pkgs.callPackage ../../lib/default.nix {}) mkUser;
in {
inherit (pkgs.callPackage ../../lib/default.nix { }) mkUser;
in
{
users.extraUsers.steveej2 = mkUser {
uid = 1001;
openssh.authorizedKeys.keys = keys.users.steveej.openssh;
passwordFile = config.sops.secrets.sharedUsers-steveej.path;
hashedPasswordFile = config.sops.secrets.sharedUsers-steveej.path;
};
nix.settings.trusted-users = ["steveej"];
nix.settings.trusted-users = [ "steveej" ];
security.pam.u2f.enable = true;
security.pam.services.steveej.u2fAuth = true;