From 4d7e1c3c9427dd79f4864ee65ffffd8d5bb34a73 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 2 Dec 2023 10:58:38 +0100 Subject: [PATCH 1/3] chore: bump flake inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'agenix': 'github:ryantm/agenix/daf42cb35b2dc614d1551e37f96406e4c4a2d3e4' (2023-10-08) → 'github:ryantm/agenix/13ac9ac6d68b9a0896e3d43a082947233189e247' (2023-11-29) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01) → 'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01) • Updated input 'flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/0cbe9f69c234a7700596e943bfae7ef27a31b735?dir=lib' (2023-10-29) → 'github:NixOS/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58?dir=lib' (2023-11-29) • Updated input 'home-manager': 'github:nix-community/home-manager/04bac349d585c9df38d78e0285b780a140dc74a4' (2023-11-12) → 'github:nix-community/home-manager/28535c3a34d79071f2ccb68671971ce0c0984d7e' (2023-11-19) • Updated input 'nix-darwin': 'github:lnl7/nix-darwin/e67f2bf515343da378c3f82f098df8ca01bccc5f' (2023-11-13) → 'github:lnl7/nix-darwin/4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d' (2023-11-24) • Updated input 'nixos-flake': 'github:srid/nixos-flake/40010feda1ac1afdcc2571ef550ef3de44926b0e' (2023-11-12) → 'github:srid/nixos-flake/7c9168884128ed4634751b3e2f5553b09d7b8cb0' (2023-11-28) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9fb122519e9cd465d532f736a98c1e1eb541ef6f' (2023-11-16) → 'github:nixos/nixpkgs/d2332963662edffacfddfad59ff4f709dde80ffe' (2023-11-30) • Updated input 'unstable': 'github:nixos/nixpkgs/c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad' (2023-11-17) → 'github:nixos/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58' (2023-11-29) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index be94545..54d113a 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1696775529, - "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", + "lastModified": 1701216516, + "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "type": "github" }, "original": { @@ -108,11 +108,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1699748081, - "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=", + "lastModified": 1700392168, + "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", "owner": "nix-community", "repo": "home-manager", - "rev": "04bac349d585c9df38d78e0285b780a140dc74a4", + "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1699867978, - "narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -221,11 +221,11 @@ }, "nixos-flake": { "locked": { - "lastModified": 1699802281, - "narHash": "sha256-kfR7z4so9s9vsYHT3Q9kU/GvYYCVeBsQH1h7EpSvkHg=", + "lastModified": 1701201086, + "narHash": "sha256-GU2A+dI5Kp2+4g2dWixeTkp6yKhaW9BZ1uE9Z5cC82w=", "owner": "srid", "repo": "nixos-flake", - "rev": "40010feda1ac1afdcc2571ef550ef3de44926b0e", + "rev": "7c9168884128ed4634751b3e2f5553b09d7b8cb0", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700097215, - "narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=", + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -356,11 +356,11 @@ }, "unstable": { "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { -- 2.42.0 From 2ee4bc56827539a088ee0c3032b43704a4af84f0 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 2 Dec 2023 11:01:53 +0100 Subject: [PATCH 2/3] feat: NixOS 23.11 Tapir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://nixos.org/manual/nixos/stable/release-notes#sec-release-23.11-highlights Track nixos-23.11 branch, remove unstable overlays This will update our services to the following versions: nextcloud: 27.1.3 -> 27.1.4 forgejo: 1.20.5-0 -> 1.20.6-0 keycloak: 21.1.2 -> 22.0.5 matrix-synapse: 1.95.1 -> 1.97.0 Internal: postgresql: 14.9 -> 15.5 Flake inputs diff: • Updated input 'home-manager': 'github:nix-community/home-manager/28535c3a34d79071f2ccb68671971ce0c0984d7e' (2023-11-19) → 'github:nix-community/home-manager/aeb2232d7a32530d3448318790534d196bf9427a' (2023-11-24) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d2332963662edffacfddfad59ff4f709dde80ffe' (2023-11-30) → 'github:nixos/nixpkgs/5de0b32be6e85dc1a9404c75131316e4ffbc634c' (2023-12-01) --- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- hosts/flora-6/configuration.nix | 9 --------- hosts/nachtigall/default.nix | 10 ---------- overlays/default.nix | 6 ------ 5 files changed, 10 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 54d113a..412674f 100644 --- a/flake.lock +++ b/flake.lock @@ -161,16 +161,16 @@ ] }, "locked": { - "lastModified": 1700392168, - "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "owner": "nix-community", "repo": "home-manager", - "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -236,16 +236,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701362232, - "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "lastModified": 1701389149, + "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c171180..350ce52 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.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; 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.05"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/hosts/flora-6/configuration.nix b/hosts/flora-6/configuration.nix index dc20845..2c49348 100644 --- a/hosts/flora-6/configuration.nix +++ b/hosts/flora-6/configuration.nix @@ -7,15 +7,6 @@ }: let psCfg = config.pub-solar; in { - imports = [ - "${flake.inputs.unstable}/nixos/modules/services/continuous-integration/gitea-actions-runner.nix" - "${flake.inputs.unstable}/nixos/modules/services/web-servers/caddy/default.nix" - ]; - disabledModules = [ - "services/continuous-integration/gitea-actions-runner.nix" - "services/web-servers/caddy/default.nix" - ]; - config = { # Override nix.conf for more agressive garbage collection nix.extraOptions = lib.mkForce '' diff --git a/hosts/nachtigall/default.nix b/hosts/nachtigall/default.nix index 5e21f53..a7729a2 100644 --- a/hosts/nachtigall/default.nix +++ b/hosts/nachtigall/default.nix @@ -30,15 +30,5 @@ ./apps/matrix/synapse.nix ./apps/matrix/irc.nix ./apps/nginx-matrix.nix - - # Override with module from nixos-unstable, needs to be added - # to disabledModules as well - "${flake.inputs.unstable}/nixos/modules/services/misc/gitea.nix" - "${flake.inputs.unstable}/nixos/modules/services/web-apps/mastodon.nix" - ]; - - disabledModules = [ - "services/misc/gitea.nix" - "services/web-apps/mastodon.nix" ]; } diff --git a/overlays/default.nix b/overlays/default.nix index c11a2c9..4f7efb8 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -8,12 +8,6 @@ overlays = ({ ... }: { nixpkgs.overlays = [ (final: prev: { - mastodon = inputs.unstable.legacyPackages.${prev.system}.mastodon; - forgejo = inputs.unstable.legacyPackages.${prev.system}.forgejo; - forgejo-actions-runner = inputs.unstable.legacyPackages.${prev.system}.forgejo-actions-runner; - - mediawiki = inputs.unstable.legacyPackages.${prev.system}.mediawiki; - element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; }; }) ]; -- 2.42.0 From 7cf6f5151661373cb3cbeca846d8537aff88fb02 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 2 Dec 2023 11:58:48 +0100 Subject: [PATCH 3/3] fix: nextcloud interned strings buffer defaults to 23 now --- hosts/nachtigall/apps/nextcloud.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hosts/nachtigall/apps/nextcloud.nix b/hosts/nachtigall/apps/nextcloud.nix index 0b9af81..013362f 100644 --- a/hosts/nachtigall/apps/nextcloud.nix +++ b/hosts/nachtigall/apps/nextcloud.nix @@ -107,10 +107,6 @@ simpleSignUpLink.shown = false; }; - phpOptions = { - "opcache.interned_strings_buffer" = "16"; - }; - # Calculated with 4GiB RAM, 80MiB process size available on # https://spot13.com/pmcalculator/ poolSettings = { -- 2.42.0