Fixed conflicts
This commit is contained in:
commit
b415eb0550
@ -34,11 +34,11 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"L /root/.gnupg - - - - /state/root/gnupg"
|
"L /root/.gnupg - - - - ${state-dir}/user/root/gnupg"
|
||||||
# "L /root/.emacs.d - - - - /state/root/emacs.d"
|
# "L /root/.emacs.d - - - - ${state-dir}/user/root/emacs.d"
|
||||||
"L /root/.ssh/id_rsa - - - - ${state-dir}/root/ssh/id_rsa"
|
"L /root/.ssh/id_rsa - - - - ${state-dir}/user/root/ssh/id_rsa"
|
||||||
"L /root/.ssh/id_rsa.pub - - - - ${state-dir}/state/root/ssh/id_rsa.pub"
|
"L /root/.ssh/id_rsa.pub - - - - ${state-dir}/state/root/ssh/id_rsa.pub"
|
||||||
"L /root/.ssh/known_hosts - - - - ${state-dir}/root/ssh/known_hosts"
|
"L /root/.ssh/known_hosts - - - - ${state-dir}/user/root/ssh/known_hosts"
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.etc = {
|
environment.etc = {
|
||||||
|
@ -15,7 +15,7 @@ let
|
|||||||
|
|
||||||
in {
|
in {
|
||||||
environment = {
|
environment = {
|
||||||
etc.current-nixos-config.source = ../../.;
|
etc.nixos-live.source = ../../.;
|
||||||
|
|
||||||
systemPackages = global-packages;
|
systemPackages = global-packages;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user