From bbf8345289c36539c299c6d633a85d16285489d3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 30 Jul 2024 13:14:06 +0200
Subject: ...

---
 system-profiles/bcachefs.nix       | 7 +++++++
 system-profiles/core/default.nix   | 2 +-
 system-profiles/networkmanager.nix | 5 +----
 system-profiles/zfs.nix            | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 system-profiles/bcachefs.nix

(limited to 'system-profiles')

diff --git a/system-profiles/bcachefs.nix b/system-profiles/bcachefs.nix
new file mode 100644
index 00000000..65de9f7e
--- /dev/null
+++ b/system-profiles/bcachefs.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... } : {
+  config = {
+    boot.supportedFilesystems = [ "bcachefs" ];
+
+    environment.systemPackages = with pkgs; [ bcachefs-tools ];
+  };
+}
diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix
index 0859d707..6aee221f 100644
--- a/system-profiles/core/default.nix
+++ b/system-profiles/core/default.nix
@@ -102,7 +102,7 @@ in {
     };
 
     nix = {
-      package = pkgs.nixUnstable;
+      package = if builtins.hasAttr "latest" pkgs.nixVersions then pkgs.nixVersions.latest else pkgs.nixUnstable;
       settings = {
         sandbox = true;
         allowed-users = [ "*" ];
diff --git a/system-profiles/networkmanager.nix b/system-profiles/networkmanager.nix
index 0fc25619..bc5fd5ff 100644
--- a/system-profiles/networkmanager.nix
+++ b/system-profiles/networkmanager.nix
@@ -10,10 +10,7 @@ with lib;
         dhcp = "internal";
         dns = mkForce "dnsmasq";
         logLevel = "INFO";
-        extraConfig = ''
-          [connectivity]
-          uri=https://online.yggdrasil.li
-        '';
+	settings.connectivity.url = "https://online.yggdrasil.li";
       };
     };
 
diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix
index db742801..148cbb7b 100644
--- a/system-profiles/zfs.nix
+++ b/system-profiles/zfs.nix
@@ -3,7 +3,7 @@
     boot = {
       kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
       supportedFilesystems = [ "zfs" ];
-      zfs.enableUnstable = true;
+      zfs.package = pkgs.zfs_unstable;
     };
 
     environment.systemPackages = with pkgs; [ httm ];
-- 
cgit v1.2.3