From eb0d6a1274f98de0448a9ddb466e2e30d1721895 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 20 Oct 2024 21:11:51 +0200
Subject: ...

---
 system-profiles/bcachefs.nix       | 5 ++---
 system-profiles/networkmanager.nix | 4 +---
 system-profiles/zfs.nix            | 9 +++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'system-profiles')

diff --git a/system-profiles/bcachefs.nix b/system-profiles/bcachefs.nix
index 65de9f7e..f9f048b9 100644
--- a/system-profiles/bcachefs.nix
+++ b/system-profiles/bcachefs.nix
@@ -1,7 +1,6 @@
-{ config, pkgs, ... } : {
+{ pkgs, ... } : {
   config = {
-    boot.supportedFilesystems = [ "bcachefs" ];
-
+    boot.supportedFilesystems.bcachefs = true;
     environment.systemPackages = with pkgs; [ bcachefs-tools ];
   };
 }
diff --git a/system-profiles/networkmanager.nix b/system-profiles/networkmanager.nix
index bc5fd5ff..335b5653 100644
--- a/system-profiles/networkmanager.nix
+++ b/system-profiles/networkmanager.nix
@@ -10,7 +10,7 @@ with lib;
         dhcp = "internal";
         dns = mkForce "dnsmasq";
         logLevel = "INFO";
-	settings.connectivity.url = "https://online.yggdrasil.li";
+	      settings.connectivity.url = "https://online.yggdrasil.li";
       };
     };
 
@@ -18,7 +18,5 @@ with lib;
     systemd.services."systemd-networkd-wait-online".enable = mkForce false;
 
     services.resolved.enable = false;
-
-    environment.noXlibs = false;
   };
 }
diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix
index 148cbb7b..49386363 100644
--- a/system-profiles/zfs.nix
+++ b/system-profiles/zfs.nix
@@ -1,9 +1,10 @@
-{ config, pkgs, ... } : {
+{ pkgs, lib, ... } : {
   config = {
     boot = {
-      kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
-      supportedFilesystems = [ "zfs" ];
-      zfs.package = pkgs.zfs_unstable;
+      kernelPackages = pkgs.linuxPackages_6_10;
+      zfs.package = pkgs.zfs_2_2;
+
+      supportedFilesystems.zfs = true;
     };
 
     environment.systemPackages = with pkgs; [ httm ];
-- 
cgit v1.2.3