Compare commits
2 commits
b63959f307
...
1fe332c302
Author | SHA1 | Date | |
---|---|---|---|
1fe332c302 | |||
bf260096d5 |
3 changed files with 30 additions and 11 deletions
|
@ -48,4 +48,16 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
flake.modules.homeManager.default =
|
||||||
|
{ config, ... }:
|
||||||
|
{
|
||||||
|
imports = [ inputs.impermanence.homeManagerModules.impermanence ];
|
||||||
|
options.persistDirs = mkOpts "directory" { };
|
||||||
|
options.persistFiles = mkOpts "file" { };
|
||||||
|
config.home.persistence."/persist${config.home.homeDirectory}" = {
|
||||||
|
allowOther = true;
|
||||||
|
directories = config.persistDirs;
|
||||||
|
files = config.persistFiles;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,20 @@
|
||||||
|
{ config, lib, ... }:
|
||||||
|
let
|
||||||
|
cfg = config.flake;
|
||||||
|
inherit (lib.modules) mkMerge;
|
||||||
|
inherit (cfg.lib.modules) forAllUsers';
|
||||||
|
in
|
||||||
{
|
{
|
||||||
flake.modules.nixos.default = {
|
flake.modules.nixos.default = mkMerge [
|
||||||
persistFiles = [
|
{
|
||||||
"/etc/ssh/ssh_host_ed25519_key"
|
persistFiles = [
|
||||||
"/etc/ssh/ssh_host_ed25519_key.pub"
|
"/etc/ssh/ssh_host_ed25519_key"
|
||||||
"/etc/ssh/ssh_host_rsa_key"
|
"/etc/ssh/ssh_host_ed25519_key.pub"
|
||||||
"/etc/ssh/ssh_host_rsa_key.pub"
|
"/etc/ssh/ssh_host_rsa_key"
|
||||||
];
|
"/etc/ssh/ssh_host_rsa_key.pub"
|
||||||
};
|
];
|
||||||
|
users.users = forAllUsers' (_: value: { openssh.authorizedKeys.keys = [ value.pubkey ]; });
|
||||||
|
}
|
||||||
|
{ users.users.root.openssh.authorizedKeys.keys = [ cfg.admin.pubkey ]; }
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,8 +11,6 @@ in
|
||||||
#TODO: move sudo/security options elsewhere
|
#TODO: move sudo/security options elsewhere
|
||||||
# security.sudo.wheelNeedsPassword = false;
|
# security.sudo.wheelNeedsPassword = false;
|
||||||
# nix.settings.trusted-users = [ "@wheel" ];
|
# nix.settings.trusted-users = [ "@wheel" ];
|
||||||
#TODO: move ssh key settings elsewhere
|
|
||||||
# users.users.root.openssh.authorizedKeys.keys = [ owner.pubkey ];
|
|
||||||
# persist uids and gids
|
# persist uids and gids
|
||||||
persistDirs = [ "/var/lib/nixos" ];
|
persistDirs = [ "/var/lib/nixos" ];
|
||||||
users = {
|
users = {
|
||||||
|
@ -23,7 +21,6 @@ in
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
hashedPasswordFile = config.sops.secrets."${name}/hashedPassword".path;
|
hashedPasswordFile = config.sops.secrets."${name}/hashedPassword".path;
|
||||||
extraGroups = optional (value.primary or false) "wheel";
|
extraGroups = optional (value.primary or false) "wheel";
|
||||||
openssh.authorizedKeys.keys = [ value.pubkey ];
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue