From fa42667c2a73ef289fec23887ca366de35b24c91 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Fri, 30 May 2025 18:32:47 +0200
Subject: [PATCH] fix: update NixOS channel references to version 25.05 and
 adjust netdata configuration

---
 hosts/fw/channel                 | 2 +-
 hosts/mail/channel               | 2 +-
 hosts/mail/modules/dovecot.nix   | 4 +---
 hosts/nb/configuration.nix       | 1 +
 hosts/nb/modules/fingerprint.nix | 1 -
 hosts/web-arm/channel            | 2 +-
 utils/modules/netdata.nix        | 8 ++++++--
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/hosts/fw/channel b/hosts/fw/channel
index ced117e..93f5df5 100644
--- a/hosts/fw/channel
+++ b/hosts/fw/channel
@@ -1 +1 @@
-https://channels.nixos.org/nixos-24.11
+https://channels.nixos.org/nixos-25.05
diff --git a/hosts/mail/channel b/hosts/mail/channel
index ced117e..93f5df5 100644
--- a/hosts/mail/channel
+++ b/hosts/mail/channel
@@ -1 +1 @@
-https://channels.nixos.org/nixos-24.11
+https://channels.nixos.org/nixos-25.05
diff --git a/hosts/mail/modules/dovecot.nix b/hosts/mail/modules/dovecot.nix
index a9ef486..cf8e8c1 100644
--- a/hosts/mail/modules/dovecot.nix
+++ b/hosts/mail/modules/dovecot.nix
@@ -88,6 +88,7 @@ in
 {
   environment.systemPackages = with pkgs; [
     doveSync
+    dovecot_pigeonhole
   ];
 
   services.dovecot2 = {
@@ -215,9 +216,6 @@ in
       # Read multiple mails in parallel, improves performance
       mail_prefetch_count = 20
     '';
-    modules = [
-      pkgs.dovecot_pigeonhole
-    ];
     protocols = [
       "sieve"
     ];
diff --git a/hosts/nb/configuration.nix b/hosts/nb/configuration.nix
index 0e2bb86..c708175 100644
--- a/hosts/nb/configuration.nix
+++ b/hosts/nb/configuration.nix
@@ -146,6 +146,7 @@ in {
       "/var/lib/bluetooth"
       "/var/lib/docker"
       "/var/lib/flatpak"
+      "/var/lib/fprint"
       "/var/lib/nixos"
       "/var/lib/mysql"
       "/etc/NetworkManager/system-connections"
diff --git a/hosts/nb/modules/fingerprint.nix b/hosts/nb/modules/fingerprint.nix
index d26a50d..5ff0be2 100644
--- a/hosts/nb/modules/fingerprint.nix
+++ b/hosts/nb/modules/fingerprint.nix
@@ -5,7 +5,6 @@
 
   security.pam.services.login.fprintAuth = true;
   security.pam.services.sudo.fprintAuth = true;
-  security.pam.services.sddm.fprintAuth = true;
   # If you use swaylock and want fingerprint auth for it:
   security.pam.services.swaylock.fprintAuth = true;
   # Add Polkit rule to allow locally active users to manage their own fingerprints
diff --git a/hosts/web-arm/channel b/hosts/web-arm/channel
index ced117e..93f5df5 100644
--- a/hosts/web-arm/channel
+++ b/hosts/web-arm/channel
@@ -1 +1 @@
-https://channels.nixos.org/nixos-24.11
+https://channels.nixos.org/nixos-25.05
diff --git a/utils/modules/netdata.nix b/utils/modules/netdata.nix
index 1aab534..2160f1d 100644
--- a/utils/modules/netdata.nix
+++ b/utils/modules/netdata.nix
@@ -1,10 +1,14 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) {
     config = { allowUnfree = true; };
   };
 in
 {
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "netdata"
+  ];
+
   services.netdata.configDir."python.d.conf" = pkgs.writeText "python.d.conf" ''
     postfix: yes
   '';
@@ -14,7 +18,7 @@ in
     python.enable = true;
 
     package = pkgs.netdata.override {
-      withCloud = true;
+      withCloudUi = true;
     };
 
     config = {