Merge branch 'nixops' of ssh://git.fudo.org:2222/fudosys/NixOS into nixops
This commit is contained in:
commit
b9406364d2
|
@ -21,11 +21,6 @@ with lib; {
|
|||
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 = {
|
||||
openssh = {
|
||||
hostKeys = [
|
||||
|
|
|
@ -11,11 +11,7 @@ in {
|
|||
userName = name;
|
||||
userEmail = email;
|
||||
ignores = [ "*~" ];
|
||||
extraConfig = {
|
||||
pull = {
|
||||
rebase = false;
|
||||
};
|
||||
};
|
||||
extraConfig = { pull = { rebase = false; }; };
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -42,4 +38,11 @@ in {
|
|||
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"
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue