From 8bb6821b87adac80c112739c626444e816dcf343 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 4 Jun 2023 23:02:06 +0200
Subject: [PATCH] prepare for nixos 23.05

---
 nix/nixos-module/container/defaults.nix       | 9 +--------
 nix/nixos-module/container/upstream/pppoe.nix | 6 +++---
 nix/nixos-module/defaults.nix                 | 8 ++++----
 nix/nixos-module/server/defaults.nix          | 2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/nix/nixos-module/container/defaults.nix b/nix/nixos-module/container/defaults.nix
index 2eaf2e5..2e68036 100644
--- a/nix/nixos-module/container/defaults.nix
+++ b/nix/nixos-module/container/defaults.nix
@@ -6,18 +6,11 @@
     (modulesPath + "/virtualisation/lxc-container.nix")
   ];
 
-  boot = {
-    isContainer = true;
-    loader = {
-      initScript.enable = true;
-    };
-  };
-
   environment.etc."machine-id".text =
     builtins.substring 0 8 (
       builtins.hashString "sha256" config.networking.hostName
     );
-  
+
   nix = {
     settings = {
       sandbox = false;
diff --git a/nix/nixos-module/container/upstream/pppoe.nix b/nix/nixos-module/container/upstream/pppoe.nix
index 95fde22..5476104 100644
--- a/nix/nixos-module/container/upstream/pppoe.nix
+++ b/nix/nixos-module/container/upstream/pppoe.nix
@@ -26,7 +26,7 @@ in lib.mkIf (pppoeInterfaces != {}) {
       enable = true;
       autostart = true;
       config = ''
-        plugin rp-pppoe.so
+        plugin pppoe.so
         nic-${upstream.link}
         ifname ${ifName}
         # Login settings. (PAP)
@@ -39,11 +39,11 @@ in lib.mkIf (pppoeInterfaces != {}) {
         maxfail 0
         # Seconds between reconnection attempts
         holdoff 1
- 
+
         # LCP settings.
         lcp-echo-interval 5
         lcp-echo-failure 6
-        
+
         # PPPoE compliant settings.
         noaccomp
         default-asyncmap
diff --git a/nix/nixos-module/defaults.nix b/nix/nixos-module/defaults.nix
index 51563e2..d046881 100644
--- a/nix/nixos-module/defaults.nix
+++ b/nix/nixos-module/defaults.nix
@@ -7,9 +7,9 @@
     # Prevents automatic creation of interface bond0 by the kernel
     "bonding.max_bonds=0"
   ];
-  boot.tmpOnTmpfs = true;
+  boot.tmp.useTmpfs = true;
   # Includes wireguard
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.zfsUnstable.latestCompatibleLinuxPackages;
   # Keep building
   boot.zfs.enableUnstable = true;
 
@@ -35,8 +35,8 @@
   };
 
   documentation = {
-    enable = false;
-    nixos.enable = false;
+    enable = lib.mkForce false;
+    nixos.enable = lib.mkForce false;
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/nix/nixos-module/server/defaults.nix b/nix/nixos-module/server/defaults.nix
index 2323758..0bcfb15 100644
--- a/nix/nixos-module/server/defaults.nix
+++ b/nix/nixos-module/server/defaults.nix
@@ -18,7 +18,7 @@
 
   services.openssh = {
     enable = true;
-    permitRootLogin = "prohibit-password";
+    settings.PermitRootLogin = "prohibit-password";
   };
 
   # additional config for bare metal