From bc9ac6011ed96370b4134a419b8fc79979d89c68 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 12 Jun 2024 13:07:11 +0200 Subject: [PATCH 1/3] flake: update to NixOS 24.05 Fix warnings: trace: warning: The option `services.nextcloud.extraOptions' defined in `/nix/store/a53lc1l5wy9vbv1d3n93903dq0wjgvfj-source/flake.nix#nixosModules.nextcloud' has been renamed to `services.nextcloud.settings'. trace: warning: The option `services.nextcloud.skeletonDirectory' defined in `/nix/store/a53lc1l5wy9vbv1d3n93903dq0wjgvfj-source/flake.nix#nixosModules.nextcloud' has been renamed to `services.nextcloud.settings.skeletondirectory'. trace: warning: The option `services.nextcloud.config.overwriteProtocol' defined in `/nix/store/a53lc1l5wy9vbv1d3n93903dq0wjgvfj-source/flake.nix#nixosModules.nextcloud' has been renamed to `services.nextcloud.settings.overwriteprotocol'. trace: warning: The option `services.matrix-synapse.sliding-sync' defined in `/nix/store/a53lc1l5wy9vbv1d3n93903dq0wjgvfj-source/flake.nix#nixosModules.matrix' has been renamed to `services.matrix-sliding-sync'. Fix errors: loki: fix config for version 3+ keycloak: declarative-user-profile feature is now enabled by default error: A definition for option `programs.gnupg.agent.pinentryPackage' is not of type `null or package'. Definition values: - In `/nix/store/a53lc1l5wy9vbv1d3n93903dq0wjgvfj-source/flake.nix#nixosModules.forgejo': "curses" --- flake.lock | 28 ++++++++++++++-------------- flake.nix | 4 ++-- modules/forgejo/default.nix | 2 +- modules/keycloak/default.nix | 1 - modules/loki/default.nix | 12 +++++++++++- modules/matrix/default.nix | 20 ++++++++++---------- modules/nextcloud/default.nix | 7 +++---- overlays/default.nix | 3 --- 8 files changed, 41 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 5c9b4b6c..28cb149d 100644 --- a/flake.lock +++ b/flake.lock @@ -236,16 +236,16 @@ ] }, "locked": { - "lastModified": 1717476296, - "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -299,11 +299,11 @@ ] }, "locked": { - "lastModified": 1718662658, - "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", + "lastModified": 1719128254, + "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", + "rev": "50581970f37f06a4719001735828519925ef8310", "type": "github" }, "original": { @@ -330,16 +330,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718811006, - "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", + "lastModified": 1718835956, + "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", + "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -533,11 +533,11 @@ }, "unstable": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e361d3fa..ccff813f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { # Track channels with commits tested and built by hydra - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05"; @@ -9,7 +9,7 @@ nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/modules/forgejo/default.nix b/modules/forgejo/default.nix index 26f79795..dee6d122 100644 --- a/modules/forgejo/default.nix +++ b/modules/forgejo/default.nix @@ -163,7 +163,7 @@ # gitea gitconfig programs.gnupg.agent = { enable = true; - pinentryFlavor = "curses"; + pinentryPackage = pkgs.pinentry-curses; }; # Required to make gpg work without a graphical environment? # otherwise generating a new gpg key fails with this error: diff --git a/modules/keycloak/default.nix b/modules/keycloak/default.nix index 98c93125..3c9316e5 100644 --- a/modules/keycloak/default.nix +++ b/modules/keycloak/default.nix @@ -52,7 +52,6 @@ http-host = "127.0.0.1"; http-port = 8080; proxy = "edge"; - features = "declarative-user-profile"; }; themes = { "pub.solar" = diff --git a/modules/loki/default.nix b/modules/loki/default.nix index 0c3ea193..3fedf750 100644 --- a/modules/loki/default.nix +++ b/modules/loki/default.nix @@ -64,8 +64,8 @@ split_queries_by_interval = "0"; }; compactor = { - shared_store = "filesystem"; compaction_interval = "10m"; + delete_request_store = "filesystem"; retention_enabled = true; retention_delete_delay = "2h"; retention_delete_worker_count = 150; @@ -82,6 +82,16 @@ period = "24h"; }; } + { + from = "2024-05-31"; + store = "tsdb"; + object_store = "filesystem"; + schema = "v13"; + index = { + prefix = "index_"; + period = "24h"; + }; + } ]; }; }; diff --git a/modules/matrix/default.nix b/modules/matrix/default.nix index f8b23554..66b071f8 100644 --- a/modules/matrix/default.nix +++ b/modules/matrix/default.nix @@ -270,18 +270,18 @@ in ]; plugins = [ config.services.matrix-synapse.package.plugins.matrix-synapse-shared-secret-auth ]; + }; - sliding-sync = { - enable = true; - settings = { - SYNCV3_SERVER = "https://${publicDomain}"; - SYNCV3_BINDADDR = "127.0.0.1:8011"; - # The bind addr for Prometheus metrics, which will be accessible at - # /metrics at this address - SYNCV3_PROM = "127.0.0.1:9100"; - }; - environmentFile = config.age.secrets."matrix-synapse-sliding-sync-secret".path; + services.matrix-sliding-sync = { + enable = true; + settings = { + SYNCV3_SERVER = "https://${publicDomain}"; + SYNCV3_BINDADDR = "127.0.0.1:8011"; + # The bind addr for Prometheus metrics, which will be accessible at + # /metrics at this address + SYNCV3_PROM = "127.0.0.1:9100"; }; + environmentFile = config.age.secrets."matrix-synapse-sliding-sync-secret".path; }; services.restic.backups.matrix-synapse-storagebox = { diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix index 8bf2c1dd..0f81781c 100644 --- a/modules/nextcloud/default.nix +++ b/modules/nextcloud/default.nix @@ -31,7 +31,6 @@ https = true; secretFile = config.age.secrets."nextcloud-secrets".path; # secret maxUploadSize = "1G"; - skeletonDirectory = "./nextcloud-skeleton"; configureRedis = true; @@ -47,11 +46,11 @@ dbtype = "pgsql"; dbname = "nextcloud"; dbtableprefix = "oc_"; - overwriteProtocol = "https"; }; - extraOptions = { + settings = { overwrite.cli.url = "http://cloud.${config.pub-solar-os.networking.domain}"; + overwriteprotocol = "https"; installed = true; default_phone_region = "+49"; @@ -92,7 +91,7 @@ auth.bruteforce.protection.enabled = true; trashbin_retention_obligation = "auto,7"; - skeletondirectory = ""; + skeletondirectory = "./nextcloud-skeleton"; defaultapp = "file"; activity_expire_days = "14"; integrity.check.disabled = false; diff --git a/overlays/default.nix b/overlays/default.nix index 85fd3b3f..af9faa9b 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -12,9 +12,6 @@ unstable = import inputs.unstable { system = prev.system; }; in { - forgejo-runner = unstable.forgejo-runner; - forgejo = unstable.forgejo; - prometheus-node-exporter = unstable.prometheus-node-exporter; element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; }; element-stickerpicker = prev.callPackage ./pkgs/element-stickerpicker { inherit (inputs) element-stickers maunium-stickerpicker; From e90d923e9149863b6df308f872d03e99fb3dd425 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 12 Jun 2024 13:05:05 +0200 Subject: [PATCH 2/3] flake: update simple-mailserver to nixos-24.05 --- flake.lock | 45 ++++++++------------------------------------- flake.nix | 5 +++-- 2 files changed, 11 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 28cb149d..84e3884a 100644 --- a/flake.lock +++ b/flake.lock @@ -360,21 +360,6 @@ "type": "github" } }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1717284937, @@ -387,21 +372,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -425,24 +395,25 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_2", - "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-23_11": [ + "nixpkgs": [ + "unstable" + ], + "nixpkgs-24_05": [ "nixpkgs" ], "utils": "utils_2" }, "locked": { - "lastModified": 1706219574, - "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", + "lastModified": 1718084203, + "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", + "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixos-mailserver", "type": "gitlab" } diff --git a/flake.nix b/flake.nix index ccff813f..b5473e13 100644 --- a/flake.nix +++ b/flake.nix @@ -39,8 +39,9 @@ element-stickers.inputs.maunium-stickerpicker.follows = "maunium-stickerpicker"; element-stickers.inputs.nixpkgs.follows = "nixpkgs"; - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; - simple-nixos-mailserver.inputs.nixpkgs-23_11.follows = "nixpkgs"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; + simple-nixos-mailserver.inputs.nixpkgs-24_05.follows = "nixpkgs"; + simple-nixos-mailserver.inputs.nixpkgs.follows = "unstable"; }; outputs = From 2ebe4bd10954d1c712eb59fade480ecb8f3ec6b7 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 12 Jun 2024 14:28:42 +0200 Subject: [PATCH 3/3] loki: fix invalid config max_look_back_period, seems no longer used in loki 3 --- modules/loki/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/loki/default.nix b/modules/loki/default.nix index 3fedf750..73debac3 100644 --- a/modules/loki/default.nix +++ b/modules/loki/default.nix @@ -48,7 +48,6 @@ }; }; chunk_store_config = { - max_look_back_period = "0s"; chunk_cache_config = { embedded_cache = { enabled = true;