Update nixos

4 files changed, 24 insertions, 26 deletions

diff --git a/modules/common.nix b/modules/common.nix
index 1c9af79..241ab77 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -89,23 +89,24 @@
   };
 
   nix = rec {
-    useSandbox = lib.mkDefault true;
-    maxJobs = lib.mkOverride 110 16;
-    buildCores = lib.mkDefault 0; # auto configure
+    settings = {
+      sandbox = lib.mkDefault true;
+      cores = lib.mkDefault 0; # auto configure
+      substituters = [
+        "https://nix-community.cachix.org"
+      ];
+      trusted-public-keys = [
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+      auto-optimise-store = true;
+    };
     gc.automatic = lib.mkDefault true;
-    binaryCaches = [
-      "https://nix-community.cachix.org"
-    ];
-    binaryCachePublicKeys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
     daemonCPUSchedPolicy = "idle";
     daemonIOSchedPriority = 10;
     package = pkgs.nixFlakes;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
-    autoOptimiseStore = true;
   };
 
   boot.cleanTmpDir = true;
diff --git a/modules/monitoring.nix b/modules/monitoring.nix
index 65e292d..fd7fa59 100644
--- a/modules/monitoring.nix
+++ b/modules/monitoring.nix
@@ -46,19 +46,21 @@ in
   config = lib.mkIf cfg.enable {
     services.grafana = {
       enable = true;
-      domain = cfg.grafana-domain;
-      port = cfg.grafana-port;
-      addr = "127.0.0.1";
-      rootUrl = "https://grafana.orbekk.com/";
-      smtp = lib.mkIf config.orbekk.postfix.enable {
-        enable = true;
-        host = "localhost:25";
-        fromAddress = "root@orbekk.com";
+      settings = {
+        smtp = lib.mkIf config.orbekk.postfix.enable {
+          enable = true;
+          host = "localhost:25";
+          fromAddress = "root@orbekk.com";
+        };
+        server.root_url = "https://grafana.orbekk.com/";
+        server.domain = cfg.grafana-domain;
+        server.http_port = cfg.grafana-port;
+        server.http_addr = "127.0.0.1";
       };
 
       provision = {
         enable = true;
-        datasources = [
+        datasources.settings.datasources = [
           {
             name = "Prometheus";
             type = "prometheus";
diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix
index e38401b..1f6bde3 100644
--- a/modules/nextcloud.nix
+++ b/modules/nextcloud.nix
@@ -12,8 +12,9 @@ in
   config = lib.mkIf cfg.enable {
     services.nextcloud = {
       enable = true;
-      package = pkgs.nextcloud24;
+      package = pkgs.nextcloud25;
       hostName = "nextcloud.orbekk.com";
+      enableBrokenCiphersForSSE = false;
       config = {
         dbtype = "pgsql";
         dbuser = "nextcloud";
diff --git a/modules/thinkpad.nix b/modules/thinkpad.nix
index 69f11a4..7535a9a 100644
--- a/modules/thinkpad.nix
+++ b/modules/thinkpad.nix
@@ -11,12 +11,6 @@ in
 
   config = lib.mkIf cfg.enable {
     services = {
-      tlp = {
-        enable = true;
-        settings = {
-          "SATA_LINKPWR_ON_BAT" = "max_performance";
-        };
-      };
       xserver.xkbModel = "thinkpad60";
     };