prepare for nixos 23.05
This commit is contained in:
parent
371d41b69b
commit
8bb6821b87
|
@ -6,18 +6,11 @@
|
||||||
(modulesPath + "/virtualisation/lxc-container.nix")
|
(modulesPath + "/virtualisation/lxc-container.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot = {
|
|
||||||
isContainer = true;
|
|
||||||
loader = {
|
|
||||||
initScript.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.etc."machine-id".text =
|
environment.etc."machine-id".text =
|
||||||
builtins.substring 0 8 (
|
builtins.substring 0 8 (
|
||||||
builtins.hashString "sha256" config.networking.hostName
|
builtins.hashString "sha256" config.networking.hostName
|
||||||
);
|
);
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
settings = {
|
settings = {
|
||||||
sandbox = false;
|
sandbox = false;
|
||||||
|
|
|
@ -26,7 +26,7 @@ in lib.mkIf (pppoeInterfaces != {}) {
|
||||||
enable = true;
|
enable = true;
|
||||||
autostart = true;
|
autostart = true;
|
||||||
config = ''
|
config = ''
|
||||||
plugin rp-pppoe.so
|
plugin pppoe.so
|
||||||
nic-${upstream.link}
|
nic-${upstream.link}
|
||||||
ifname ${ifName}
|
ifname ${ifName}
|
||||||
# Login settings. (PAP)
|
# Login settings. (PAP)
|
||||||
|
@ -39,11 +39,11 @@ in lib.mkIf (pppoeInterfaces != {}) {
|
||||||
maxfail 0
|
maxfail 0
|
||||||
# Seconds between reconnection attempts
|
# Seconds between reconnection attempts
|
||||||
holdoff 1
|
holdoff 1
|
||||||
|
|
||||||
# LCP settings.
|
# LCP settings.
|
||||||
lcp-echo-interval 5
|
lcp-echo-interval 5
|
||||||
lcp-echo-failure 6
|
lcp-echo-failure 6
|
||||||
|
|
||||||
# PPPoE compliant settings.
|
# PPPoE compliant settings.
|
||||||
noaccomp
|
noaccomp
|
||||||
default-asyncmap
|
default-asyncmap
|
||||||
|
|
|
@ -7,9 +7,9 @@
|
||||||
# Prevents automatic creation of interface bond0 by the kernel
|
# Prevents automatic creation of interface bond0 by the kernel
|
||||||
"bonding.max_bonds=0"
|
"bonding.max_bonds=0"
|
||||||
];
|
];
|
||||||
boot.tmpOnTmpfs = true;
|
boot.tmp.useTmpfs = true;
|
||||||
# Includes wireguard
|
# Includes wireguard
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.zfsUnstable.latestCompatibleLinuxPackages;
|
||||||
# Keep building
|
# Keep building
|
||||||
boot.zfs.enableUnstable = true;
|
boot.zfs.enableUnstable = true;
|
||||||
|
|
||||||
|
@ -35,8 +35,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
documentation = {
|
documentation = {
|
||||||
enable = false;
|
enable = lib.mkForce false;
|
||||||
nixos.enable = false;
|
nixos.enable = lib.mkForce false;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
permitRootLogin = "prohibit-password";
|
settings.PermitRootLogin = "prohibit-password";
|
||||||
};
|
};
|
||||||
|
|
||||||
# additional config for bare metal
|
# additional config for bare metal
|
||||||
|
|
Loading…
Reference in New Issue