semi-major-ish cleanup throughout tree
This commit is contained in:
parent
610ae7c5fc
commit
25af328bfa
1 changed files with 170 additions and 107 deletions
|
|
@ -1,33 +1,17 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
USER_ID = 1000;
|
||||
KEY_FILE = "id_ed25519";
|
||||
in {
|
||||
{pkgs, ...}: {
|
||||
# Password set imperatively via `passwd`
|
||||
# so `mutableUsers = false` doesn't accidentally lock out SDDM/TTY
|
||||
users.mutableUsers = true;
|
||||
|
||||
users.users.coyote = {
|
||||
isNormalUser = true;
|
||||
description = "coyote";
|
||||
extraGroups = ["wheel" "networkmanager" "lp" "scanner"];
|
||||
uid = USER_ID;
|
||||
extraGroups = ["wheel" "networkmanager" "lp" "scanner" "video" "render" "input" "audio" "kvm"];
|
||||
uid = 1000;
|
||||
};
|
||||
users.defaultUserShell = pkgs.unstable.fish;
|
||||
users.defaultUserShell = pkgs.fish;
|
||||
|
||||
# daemon blurb to get SSH for Git working
|
||||
environment.sessionVariables.SSH_AUTH_SOCK = "/run/user/${builtins.toString USER_ID}/ssh-agent";
|
||||
|
||||
systemd.user.services.ssh-add-key = {
|
||||
wantedBy = ["default.target"];
|
||||
after = ["ssh-agent.service"];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStartPre = "${pkgs.coreutils-full}/bin/sleep 1";
|
||||
ExecStart = [
|
||||
"${pkgs.openssh}/bin/ssh-add ${config.users.users.coyote.home}/.ssh/${KEY_FILE}"
|
||||
];
|
||||
Restart = "on-failure";
|
||||
RestartSec = 1;
|
||||
};
|
||||
environment.sessionVariables = {
|
||||
NH_FLAKE = "/home/coyote/NixOS";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue