update inputs

flake.lock

@@ -243,16 +243,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1690367991,
+        "lastModified": 1690526400,
-        "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=",
+        "narHash": "sha256-5ED8OTTG0UpPh/U+C9Nx9W/S8E72y7W+floAxN4aahA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703",
+        "rev": "05ea04c13345aefce98bc118fd988c2283f360e7",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -275,6 +275,22 @@
         "type": "github"
       }
     },
+    "nixpkgs2": {
+      "locked": {
+        "lastModified": 1690272529,
+        "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "notlua": {
       "inputs": {
         "nixpkgs": [
@@ -341,6 +357,7 @@
         "nixos-mailserver": "nixos-mailserver",
         "nixos-router": "nixos-router",
         "nixpkgs": "nixpkgs",
+        "nixpkgs2": "nixpkgs2",
         "notlua": "notlua",
         "notnft": "notnft",
         "nur": "nur",

flake.nix

@@ -2,7 +2,8 @@
   description = "NixOS + Home Manager configuration of chayleaf";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/master";
+    nixpkgs2.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     impermanence.url = "github:nix-community/impermanence";
     nur.url = "github:nix-community/NUR";
@@ -48,7 +49,7 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, nixos-hardware, impermanence, home-manager, nur, nix-gaming, notlua, notnft, nixos-mailserver, nixos-router, maubot, ... }:
+  outputs = inputs@{ self, nixpkgs, nixpkgs2, nixos-hardware, impermanence, home-manager, nur, nix-gaming, notlua, notnft, nixos-mailserver, nixos-router, maubot, ... }:
   let
     # --impure required for developing
     # it takes the paths for modules from filesystem as opposed to flake inputs
@@ -102,6 +103,7 @@
         specialArgs.server-config = nixosConfigurations.nixserver.config;
         modules = [
           {
+            _module.args.pkgs2 = import nixpkgs2 { inherit system; overlays = [ overlay ]; };
             _module.args.notnft = if devNft then (import /${devPath}/notnft { inherit (nixpkgs) lib; }).config.notnft else notnft.lib.${system};
           }
           (if devNixRt then import /${devPath}/nixos-router else nixos-router.nixosModules.default)

system/hardware/bpi-r3/default.nix

@@ -1,4 +1,5 @@
 { pkgs
+, pkgs2
 , config
 , ... }:
 
@@ -9,7 +10,7 @@
   };
 
   # boot.kernelPackages = pkgs.linuxPackages_testing;
-  boot.kernelPackages = pkgs.linuxPackages_bpiR3;
+  boot.kernelPackages = pkgs2.linuxPackages_bpiR3;
 
   hardware.deviceTree.enable = true;
   hardware.deviceTree.filter = "mt7986a-bananapi-bpi-r3.dtb";

system/hardware/bpi-r3/pkgs.nix

@@ -265,8 +265,8 @@ in rec {
       COMMON_CLK_MEDIATEK_FHCTL = yes;
       COMMON_CLK_MT7986 = yes;
       COMMON_CLK_MT7986_ETHSYS = yes;
-      CPU_THERMAL = yes;
+      # CPU_THERMAL = yes;
-      THERMAL_OF = yes;
+      # THERMAL_OF = yes;
       EINT_MTK = yes;
       MEDIATEK_GE_PHY = yes;
       MEDIATEK_WATCHDOG = yes;

system/hosts/nixserver/home.nix

@@ -149,25 +149,19 @@ in {
       node = {
         enable = true;
         enabledCollectors = [ "logind" "systemd" ];
-        listenAddress = "127.0.0.1";
         port = 9101; # cups is 9100
       };
       dovecot = {
         enable = true;
         scopes = [ "user" "global" ];
-        listenAddress = "127.0.0.1";
       };
       nextcloud = {
         enable = true;
         url = "https://cloud.${cfg.domainName}";
         username = "nextcloud-exporter";
         passwordFile = "/secrets/nextcloud_exporter_password";
-        listenAddress = "127.0.0.1";
-      };
-      nginx = {
-        enable = true;
-        listenAddress = "127.0.0.1";
       };
+      nginx = { enable = true; };
       nginxlog = {
         enable = true;
         group = "nginx";
@@ -178,32 +172,13 @@ in {
             source.files = [ "/var/log/nginx/comments.log" ];
           }
         ];
-        listenAddress = "127.0.0.1";
-      };
-      postfix = {
-        enable = true;
-        listenAddress = "127.0.0.1";
-      };
-      postgres = {
-        enable = true;
-        listenAddress = "127.0.0.1";
-      };
-      process = {
-        enable = true;
-        listenAddress = "127.0.0.1";
-      };
-      redis = {
-        enable = true;
-        listenAddress = "127.0.0.1";
-      };
-      rspamd = {
-        enable = true;
-        listenAddress = "127.0.0.1";
-      };
-      smartctl = {
-        enable = true;
-        listenAddress = "127.0.0.1";
       };
+      postfix = { enable = true; };
+      postgres = { enable = true; };
+      process.enable = true;
+      redis.enable = true;
+      rspamd.enable = true;
+      smartctl.enable = true;
     };
     checkConfig = "syntax-only";
     scrapeConfigs = [