Merge branch 'nixops' of ssh://git.fudo.org:2222/fudosys/NixOS into nixops

This commit is contained in:
Niten 2021-03-03 19:03:11 +00:00
commit b9406364d2
2 changed files with 8 additions and 10 deletions

View File

@ -21,11 +21,6 @@ with lib; {
Defaults lecture = never Defaults lecture = never
''; '';
systemd.tmpfiles.rules = [
"L /root/.ssh/id_rsa - - - - /state/root/ssh/id_rsa"
"L /root/.ssh/id_rsa.pub - - - - /state/root/ssh/id_rsa.pub"
];
services = { services = {
openssh = { openssh = {
hostKeys = [ hostKeys = [

View File

@ -11,11 +11,7 @@ in {
userName = name; userName = name;
userEmail = email; userEmail = email;
ignores = [ "*~" ]; ignores = [ "*~" ];
extraConfig = { extraConfig = { pull = { rebase = false; }; };
pull = {
rebase = false;
};
};
}; };
}; };
@ -42,4 +38,11 @@ in {
HISTCONTROL = "ignoredups:ignorespace"; HISTCONTROL = "ignoredups:ignorespace";
}; };
}; };
systemd.user.tmpfiles.rules = [
"L /root/.gnupg - - - - /state/root/gnupg"
"L /root/.emacs.d - - - - /state/root/emacs.d"
"L /root/.ssh/id_rsa - - - - /state/root/ssh/id_rsa"
"L /root/.ssh/id_rsa.pub - - - - /state/root/ssh/id_rsa.pub"
];
} }