From ca2deed668711fe9a8dac9e622da13e00a1554d2 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Sat, 29 Jun 2024 20:45:54 +0200 Subject: [PATCH] WIP: all: Update to nixos-24.05 --- flake.lock | 15 ++++++++------- flake.nix | 4 ++-- hosts/bekkalokk/services/gitea/default.nix | 2 +- hosts/bekkalokk/services/kerberos/default.nix | 13 ------------- hosts/ildkule/services/monitoring/loki.nix | 4 +--- 5 files changed, 12 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index fdb65f16..c2fe550f 100644 --- a/flake.lock +++ b/flake.lock @@ -107,15 +107,16 @@ ] }, "locked": { - "lastModified": 1710311999, - "narHash": "sha256-s0pT1NyrMgeolUojXXcnXQDymN7m80GTF7itCv0ZH20=", + "lastModified": 1717234745, + "narHash": "sha256-MFyKRdw4WQD6V3vRGbP6MYbtJhZp712zwzjW6YiOBYM=", "owner": "dali99", "repo": "nixos-matrix-modules", - "rev": "6c9b67974b839740e2a738958512c7a704481157", + "rev": "d7dc42c9bbb155c5e4aa2f0985d0df75ce978456", "type": "github" }, "original": { "owner": "dali99", + "ref": "v0.6.0", "repo": "nixos-matrix-modules", "type": "github" } @@ -142,16 +143,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715410392, - "narHash": "sha256-ltp1jQps9tym0uWNl/lTniHSQngCtNIyzlymu+ZSyts=", + "lastModified": 1719520878, + "narHash": "sha256-5BXzNOl2RVHcfS/oxaZDKOi7gVuTyWPibQG0DHd5sSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f8bf7503bd85d5208575f4bd81c8b1fc999a468", + "rev": "a44bedbb48c367f0476e6a3a27bf28f6330faf23", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11-small", + "ref": "nixos-24.05-small", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 929c79dc..d5455336 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "PVV System flake"; inputs = { - nixpkgs.url = "nixpkgs/nixos-23.11-small"; + nixpkgs.url = "nixpkgs/nixos-24.05-small"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable-small"; sops-nix.url = "github:Mic92/sops-nix"; @@ -17,7 +17,7 @@ pvv-calendar-bot.url = "git+https://git.pvv.ntnu.no/Projects/calendar-bot.git"; pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs"; - matrix-next.url = "github:dali99/nixos-matrix-modules"; + matrix-next.url = "github:dali99/nixos-matrix-modules/v0.6.0"; matrix-next.inputs.nixpkgs.follows = "nixpkgs"; nix-gitea-themes.url = "git+https://git.pvv.ntnu.no/oysteikt/nix-gitea-themes.git"; diff --git a/hosts/bekkalokk/services/gitea/default.nix b/hosts/bekkalokk/services/gitea/default.nix index 516c0de4..74e90df1 100644 --- a/hosts/bekkalokk/services/gitea/default.nix +++ b/hosts/bekkalokk/services/gitea/default.nix @@ -28,7 +28,7 @@ in { database = { type = "postgres"; host = "postgres.pvv.ntnu.no"; - port = config.services.postgresql.port; + port = config.services.postgresql.settings.port; passwordFile = config.sops.secrets."gitea/database".path; createDatabase = false; }; diff --git a/hosts/bekkalokk/services/kerberos/default.nix b/hosts/bekkalokk/services/kerberos/default.nix index 48718ae9..54d17e35 100644 --- a/hosts/bekkalokk/services/kerberos/default.nix +++ b/hosts/bekkalokk/services/kerberos/default.nix @@ -1,18 +1,5 @@ { config, pkgs, lib, ... }: { - ####################### - # TODO: remove these once nixos 24.05 gets released - ####################### - imports = [ - ./krb5.nix - ./pam.nix - ]; - disabledModules = [ - "config/krb5/default.nix" - "security/pam.nix" - ]; - ####################### - security.krb5 = { enable = true; settings = { diff --git a/hosts/ildkule/services/monitoring/loki.nix b/hosts/ildkule/services/monitoring/loki.nix index bb644a65..b19524c7 100644 --- a/hosts/ildkule/services/monitoring/loki.nix +++ b/hosts/ildkule/services/monitoring/loki.nix @@ -50,7 +50,6 @@ in { boltdb_shipper = { active_index_directory = "/var/lib/loki/boltdb-shipper-index"; cache_location = "/var/lib/loki/boltdb-shipper-cache"; - shared_store = "filesystem"; cache_ttl = "24h"; }; filesystem = { @@ -59,14 +58,13 @@ in { }; limits_config = { - enforce_metric_name = false; + allow_structured_metadata = false; reject_old_samples = true; reject_old_samples_max_age = "72h"; }; compactor = { working_directory = "/var/lib/loki/compactor"; - shared_store = "filesystem"; }; # ruler = {