From 71801c35ae5c2069d15169f3987a3e6c9364e2f3 Mon Sep 17 00:00:00 2001 From: fi Date: Sat, 26 Sep 2026 21:46:48 +0200 Subject: [PATCH 1/8] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0c32f40fe3e2a9adfc427fd5abc061a31043ea44' (2026-09-15) → 'github:NixOS/nixpkgs/d31a9b2676c62b7cdbffb788088d958b4530089b' (2026-09-26) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/401fcc751fe4f8cd8ca584c851363398099479a6' (2026-09-15) → 'github:NixOS/nixpkgs/f9bce96a417afbb9c64725f8727e42efafeafc21' (2026-09-26) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/7a1ebacb35eba7648fc5bb28020dc0ee76a21d5c' (2026-09-15) → 'github:NixOS/nixpkgs/36bebc5639fda7c20265de714291da8b628475ee' (2026-09-26) • Updated input 'sops-nix': 'github:Mic92/sops-nix/13616fff713a9f94055c66f15687ebdc17a335df' (2026-09-09) → 'github:Mic92/sops-nix/2bd00bd9bb35fe6d114888c8f1c2e946c541dd8f' (2026-09-24) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7c3e380..7f905ab 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1789485310, - "narHash": "sha256-VsDMTLSkAAJmbNha6sGNzlF33X7RESWLl3SnjDQu+4U=", + "lastModified": 1790417811, + "narHash": "sha256-hEHTLdjJ0goKe43HoPq2LWAU5T28hB5Q4qFVKiXXE+c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c32f40fe3e2a9adfc427fd5abc061a31043ea44", + "rev": "d31a9b2676c62b7cdbffb788088d958b4530089b", "type": "github" }, "original": { @@ -134,11 +134,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1789497620, - "narHash": "sha256-PsWLzbk7jyBO6qDxCBOe3/+7zL6CpQgSfWhPmP37B5I=", + "lastModified": 1790448801, + "narHash": "sha256-nAq6wML4elZMHNi/29VVZSEnptPMSo9JwhacZnLVPZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "401fcc751fe4f8cd8ca584c851363398099479a6", + "rev": "f9bce96a417afbb9c64725f8727e42efafeafc21", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1789458440, - "narHash": "sha256-Zq3ebjGURKGrgEWGFw35hrQjTM9MSxzuRhhJFA1rEdg=", + "lastModified": 1790406335, + "narHash": "sha256-AERkR3boxGJEFjgW8R8gQ7MxJws2asPI0CUxaVXjQ8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7a1ebacb35eba7648fc5bb28020dc0ee76a21d5c", + "rev": "36bebc5639fda7c20265de714291da8b628475ee", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1788914643, - "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=", + "lastModified": 1790247521, + "narHash": "sha256-TNfgoHsqsYYvaJImlWctfRkh4PseTagzegU1Dgdbehw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "13616fff713a9f94055c66f15687ebdc17a335df", + "rev": "2bd00bd9bb35fe6d114888c8f1c2e946c541dd8f", "type": "github" }, "original": { From 1d154b21d69195270663ac7b50157e09f7e23282 Mon Sep 17 00:00:00 2001 From: fi Date: Sat, 26 Sep 2026 21:55:04 +0200 Subject: [PATCH 2/8] Migrate colmena to colmenaHive --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index e46c988..bede681 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,7 @@ }; } // builtins.mapAttrs (helper.generateColmenaHost) hosts; + # Generate a base VM image for Proxmox with `nix build .#base-proxmox` packages.x86_64-linux = { base-proxmox = nixos-generators.nixosGenerate { From d3f94640296f57b8dbaa053ec14f3b31c6cab014 Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 5 Oct 2026 01:23:53 +0200 Subject: [PATCH 3/8] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Added input 'colmena': 'github:nix-community/colmena/524ddd89f62721a92e8629063d347e7a1ed390de' (2026-09-29) • Added input 'colmena/nix-github-actions': 'github:nix-community/nix-github-actions/f4158fa080ef4503c8f4c820967d946c2af31ec9' (2025-01-21) • Added input 'colmena/nix-github-actions/nixpkgs': follows 'colmena/nixpkgs' • Added input 'colmena/nixpkgs': 'github:nixos/nixpkgs/7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f' (2026-09-28) • Added input 'colmena/stable': 'github:nixos/nixpkgs/c619be20e3508300c88af8aeafeaa7017559313f' (2026-09-28) • Added input 'colmena/systems': 'github:nix-systems/triplet/6de7bc09397911ce03636afbcf6118745ab2cda0' (2026-04-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d31a9b2676c62b7cdbffb788088d958b4530089b' (2026-09-26) → 'github:NixOS/nixpkgs/daf349815cf8a920ab861cffdf0708c697911162' (2026-10-04) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/f9bce96a417afbb9c64725f8727e42efafeafc21' (2026-09-26) → 'github:NixOS/nixpkgs/41a5f2d024c835b961344e9251113613492170cf' (2026-10-04) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/36bebc5639fda7c20265de714291da8b628475ee' (2026-09-26) → 'github:NixOS/nixpkgs/2f45e44cc987ef65a0fad53b519c2052e2f97fe8' (2026-10-04) • Updated input 'sops-nix': 'github:Mic92/sops-nix/2bd00bd9bb35fe6d114888c8f1c2e946c541dd8f' (2026-09-24) → 'github:Mic92/sops-nix/dcd241ba97088c22569d1573286e1b9daad340c0' (2026-10-04) --- flake.lock | 124 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 107 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 7f905ab..3ace04f 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,27 @@ "type": "gitlab" } }, + "colmena": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs", + "stable": "stable", + "systems": "systems" + }, + "locked": { + "lastModified": 1790716853, + "narHash": "sha256-IT0OZW81jngocoxi9Gg2CTSGOC1O6qLioW17nevqIUk=", + "owner": "nix-community", + "repo": "colmena", + "rev": "524ddd89f62721a92e8629063d347e7a1ed390de", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "colmena", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -80,6 +101,27 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "colmena", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737420293, + "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -118,27 +160,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1790417811, - "narHash": "sha256-hEHTLdjJ0goKe43HoPq2LWAU5T28hB5Q4qFVKiXXE+c=", - "owner": "NixOS", + "lastModified": 1790578696, + "narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "d31a9b2676c62b7cdbffb788088d958b4530089b", + "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-26.05-small", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-master": { "locked": { - "lastModified": 1790448801, - "narHash": "sha256-nAq6wML4elZMHNi/29VVZSEnptPMSo9JwhacZnLVPZU=", + "lastModified": 1791154889, + "narHash": "sha256-5r+uZhucGDR0td6Wuy0sVJTGD06w08b7/JWCZqbIV0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9bce96a417afbb9c64725f8727e42efafeafc21", + "rev": "41a5f2d024c835b961344e9251113613492170cf", "type": "github" }, "original": { @@ -150,11 +192,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1790406335, - "narHash": "sha256-AERkR3boxGJEFjgW8R8gQ7MxJws2asPI0CUxaVXjQ8U=", + "lastModified": 1791128802, + "narHash": "sha256-/aO6R5OgFwp+lDMjfP7khEz3yLECPGKhQd4GC+Wo3Xg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36bebc5639fda7c20265de714291da8b628475ee", + "rev": "2f45e44cc987ef65a0fad53b519c2052e2f97fe8", "type": "github" }, "original": { @@ -165,6 +207,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1791122812, + "narHash": "sha256-MM/PAvITakxphijJ3Xu9ad7fS4kJseWEDAmXjakIX5E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "daf349815cf8a920ab861cffdf0708c697911162", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-26.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1779622335, "narHash": "sha256-ViA62qtL5za7V3d5I8OA9q9JcFhsVAiL5jVHwEclWqk=", @@ -182,8 +240,9 @@ }, "root": { "inputs": { + "colmena": "colmena", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -195,7 +254,7 @@ "blobs": "blobs", "flake-compat": "flake-compat", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1785198005, @@ -219,11 +278,11 @@ ] }, "locked": { - "lastModified": 1790247521, - "narHash": "sha256-TNfgoHsqsYYvaJImlWctfRkh4PseTagzegU1Dgdbehw=", + "lastModified": 1791103873, + "narHash": "sha256-nFxM+pKoZ8LJAEnUXARyCaOAloWgaW9kZQOSjWzKcTE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2bd00bd9bb35fe6d114888c8f1c2e946c541dd8f", + "rev": "dcd241ba97088c22569d1573286e1b9daad340c0", "type": "github" }, "original": { @@ -231,6 +290,37 @@ "repo": "sops-nix", "type": "github" } + }, + "stable": { + "locked": { + "lastModified": 1790608446, + "narHash": "sha256-CYsYyk0zInkpQ6ojuCpvb9MahlhFXkeZpzjOU9Lxkpk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c619be20e3508300c88af8aeafeaa7017559313f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1776166891, + "narHash": "sha256-bI8yrEGjrohR5hkQox7UrxDH7XqrYMwI8SL/LrJ1+S8=", + "owner": "nix-systems", + "repo": "triplet", + "rev": "6de7bc09397911ce03636afbcf6118745ab2cda0", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "triplet", + "type": "github" + } } }, "root": "root", From e8b06c48738ef93f80f13c82a29ce2a9e857eb1f Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 5 Oct 2026 01:24:58 +0200 Subject: [PATCH 4/8] Migrate to colmenaHive --- flake.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index bede681..a803d6d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,6 @@ { inputs = { + colmena.url = "github:nix-community/colmena"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05-small"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; @@ -14,11 +15,13 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixos-generators, simple-nixos-mailserver, sops-nix, ... }@inputs: + outputs = { self, colmena, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixos-generators, simple-nixos-mailserver, sops-nix, ... }@inputs: let hosts = import ./hosts.nix inputs; helper = import ./helper.nix inputs; in { + colmenaHive = colmena.lib.makeHive self.outputs.colmena; + colmena = { meta = { # Set the default pkgs, which is pointless in this case, From 33cf1aa580e89094c8ede1e1f9ec1f66cbaff233 Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 5 Oct 2026 02:06:00 +0200 Subject: [PATCH 5/8] update mastodon to 4.7.3 --- config/hosts/mastodon/mastodon.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 38ad95c..2ec6535 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -16,14 +16,14 @@ let }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.6.8"; + version = "4.7.3"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-fDbQunhcpnMnIufEX2oRH9vulsHjtlR95boj0M2O3CQ="; + sha256 = "sha256-cKLjdk5FWcM4e5bh2P0W2UDP+9CKI6FgHH9vDnjg2xQ="; }; # mastodon ships with broken symlinks, disable the check for that for now dontCheckForBrokenSymlinks = true; @@ -53,7 +53,7 @@ let yarnMissingHashes = prev.mastodon.src.yarnMissingHashes; }); }; - pkgs-overlay = nixpkgs-master.legacyPackages."x86_64-linux".extend mastodonNekoverseOverlay; + pkgs-overlay = nixpkgs-unstable.legacyPackages."x86_64-linux".extend mastodonNekoverseOverlay; vapidPublicKey = pkgs.writeText "vapid-public-key" "BDCbFEDCZ8eFuWr3uEq4Qc30UFZUQeNpF8OCw6OjPwAtaKS1yTM3Ue749Xjqy5WhBDjakzlixh4Gk7gluUhIdsU="; in { From 47d2d905eaae120a4c119832006d4dbff0521a15 Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 5 Oct 2026 02:32:07 +0200 Subject: [PATCH 6/8] Add mastodon patch to increase poll option character limit --- config/hosts/mastodon/mastodon.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 2ec6535..4471939 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -12,7 +12,7 @@ let }; mastodonNekoversePatches = pkgs.fetchgit { url = "https://github.com/yuri-qq/nekoverse-mastodon-patches.git"; - hash = "sha256-R9YWjJYcPxFQk1eS85jVcYLolez8M828TSwp0AeplLc="; + hash = "sha256-JU9Ej4TFZPGU3s/k3vIKkmnS2RcxVEQuDtQIrQCyL/0="; }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { @@ -47,6 +47,7 @@ let "${mastodonNekoversePatches}/patches/004_improve_custom_emoji_support.patch" "${mastodonNekoversePatches}/patches/005_increase_profile_limits.patch" "${mastodonNekoversePatches}/patches/006_increase_toot_character_limit.patch" + "${mastodonNekoversePatches}/patches/007_increase_poll_option_character_limit.patch" ]; }; yarnHash = prev.mastodon.src.yarnHash; From f9ae42eb1591da06f041315ddbd4283c0d7e9fbb Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 5 Oct 2026 02:58:21 +0200 Subject: [PATCH 7/8] update mastodon Tangerine Neue to 2.6.5 --- config/hosts/mastodon/mastodon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 4471939..ff78607 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -2,8 +2,8 @@ let tangerineUI = pkgs.fetchgit { url = "https://github.com/mattbirchler/Tangerine-Neue-for-Mastodon.git"; - rev = "2.6.4"; - hash = "sha256-yNzG7GWliWcXin1CbiQvu4euLAJ8x+r09zBWudey+84="; + rev = "2.6.5"; + hash = "sha256-exooAB0vb1cai2lS99G3LnN2bGpHng5NlvNW7wfrYyM="; }; mastodonModern = pkgs.fetchgit { url = "https://git.gay/freeplay/Mastodon-Modern.git"; From e7266e9df81fb47227e741b408ee5d03e1d7f96d Mon Sep 17 00:00:00 2001 From: fi Date: Tue, 6 Oct 2026 20:35:40 +0200 Subject: [PATCH 8/8] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/daf349815cf8a920ab861cffdf0708c697911162' (2026-10-04) → 'github:NixOS/nixpkgs/c71914ac4db6642e49a327270d414efbd94ecda9' (2026-10-06) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/41a5f2d024c835b961344e9251113613492170cf' (2026-10-04) → 'github:NixOS/nixpkgs/42b6c9dcfc912918101d29cd6d327d780aa008a7' (2026-10-06) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/2f45e44cc987ef65a0fad53b519c2052e2f97fe8' (2026-10-04) → 'github:NixOS/nixpkgs/17841f937d296c623ce015c56fe3fa89e3d52107' (2026-10-06) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3ace04f..b711b49 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1791154889, - "narHash": "sha256-5r+uZhucGDR0td6Wuy0sVJTGD06w08b7/JWCZqbIV0w=", + "lastModified": 1791311293, + "narHash": "sha256-IB+BQRZ3sjZrbTloFMD9jZ3KIHao7ZiX6gHoKH7VEFo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41a5f2d024c835b961344e9251113613492170cf", + "rev": "42b6c9dcfc912918101d29cd6d327d780aa008a7", "type": "github" }, "original": { @@ -192,11 +192,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1791128802, - "narHash": "sha256-/aO6R5OgFwp+lDMjfP7khEz3yLECPGKhQd4GC+Wo3Xg=", + "lastModified": 1791306635, + "narHash": "sha256-Nqzt5UdV1P3iKJdVuKOoQZ2h5TkvrAXl8Oy/ZLmsxSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f45e44cc987ef65a0fad53b519c2052e2f97fe8", + "rev": "17841f937d296c623ce015c56fe3fa89e3d52107", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1791122812, - "narHash": "sha256-MM/PAvITakxphijJ3Xu9ad7fS4kJseWEDAmXjakIX5E=", + "lastModified": 1791274207, + "narHash": "sha256-uJMLBTODypm3xNWa9hXaRKjGDWhjd+fUFsfcXE/G700=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "daf349815cf8a920ab861cffdf0708c697911162", + "rev": "c71914ac4db6642e49a327270d414efbd94ecda9", "type": "github" }, "original": {