toplevel,steveej-x13s,sj-srv1: bump to nixos 25.05

flake.nix

@@ -11,8 +11,9 @@
     nixpkgs-2211.url = "github:nixos/nixpkgs/nixos-22.11";
     radicalePkgs.follows = "nixpkgs-2211";
     nixpkgs-2411.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs-2505.url = "github:nixos/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs.follows = "nixpkgs-2411";
+    nixpkgs.follows = "nixpkgs-2505";
     flake-parts.url = "github:hercules-ci/flake-parts";
     get-flake.url = "github:ursi/get-flake";
 
@@ -132,7 +133,7 @@
     flake-parts.lib.mkFlake { inherit inputs; } (
       { withSystem, ... }:
       {
-        flake.colmena =
+        flake.colmenaHive = inputs.colmena.lib.makeHive (
           lib.lists.foldl (sum: cur: lib.attrsets.recursiveUpdate sum cur)
             { meta.nixpkgs = import inputs.nixpkgs.outPath { system = builtins.elemAt systems 0; }; }
             # FIXME: this doesn't seem to work to apply overlays into a node's nixpkgs import
@@ -162,19 +163,50 @@
 
                   "sj-srv1"
                 ]
-            );
+            )
+        );
 
         flake.lib = {
           inherit withSystem;
+
+          prsFn =
+            {
+              lib,
+              prs,
+              skim,
+              rustPlatform,
+              makeWrapper,
+            }:
+
+            prs.overrideAttrs (attrs: rec {
+              pname = "prs";
+
+              src = self.inputs.prs;
+              version = self.inputs.prs.shortRev;
+
+              nativeBuildInputs = attrs.nativeBuildInputs ++ [
+                makeWrapper
+              ];
+
+              cargoDeps = rustPlatform.fetchCargoVendor {
+                inherit src;
+                hash = "sha256-6kCqrwcHFy7cEl2JM+CzTWDM9abepumzdcJLq1ChzUk=";
+              };
+
+              postFixup = ''
+                wrapProgram $out/bin/prs \
+                  --prefix PATH : ${lib.makeBinPath [ skim ]}
+              '';
+            });
         };
 
         # this makes nixos-anywhere work
         flake.nixosConfigurations =
           let
-            colmenaHive = (inputs.colmena.lib.makeHive self.outputs.colmena).nodes;
+            colmenaHiveNodes = self.outputs.colmenaHive.nodes;
             router0-dmz0 = (inputs.get-flake (self + "/nix/os/devices/router0-dmz0")).nixosConfigurations;
           in
-          colmenaHive
+          colmenaHiveNodes
           // {
             router0-dmz0 = router0-dmz0.native;
 
@@ -211,72 +243,6 @@
 
                 craneLib = craneLibFn inputs'.fenix.packages.stable.toolchain;
 
-                _prsPackage =
-                  {
-                    lib,
-                    rustPlatform,
-                    installShellFiles,
-                    pkg-config,
-                    python3,
-                    glib,
-                    gpgme,
-                    gtk3,
-                    stdenv,
-                    cargoHash ? "sha256-T57RqIzurpYLHyeFhvqxmC+DoB6zUf+iTu1YkMmwtp8=",
-                    src,
-                    version,
-                    makeWrapper,
-                    skim,
-                  }:
-
-                  rustPlatform.buildRustPackage rec {
-                    pname = "prs";
-
-                    inherit src version cargoHash;
-
-                    nativeBuildInputs = [
-                      gpgme
-                      installShellFiles
-                      pkg-config
-                      python3
-                      makeWrapper
-                    ];
-
-                    cargoBuildFlags = [
-                      "--no-default-features"
-                      "--features=alias,backend-gpgme,clipboard,notify,select-fzf-bin,select-skim-bin,tomb,totp"
-                    ];
-
-                    buildInputs = [
-                      glib
-                      gpgme
-                      gtk3
-                    ];
-
-                    postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-                      for shell in bash fish zsh; do
-                        installShellCompletion --cmd prs --$shell <($out/bin/prs internal completions $shell --stdout)
-                      done
-                    '';
-
-                    postFixup = ''
-                      wrapProgram $out/bin/prs \
-                        --prefix PATH : ${lib.makeBinPath [ skim ]}
-                    '';
-
-                    meta = with lib; {
-                      description = "Secure, fast & convenient password manager CLI using GPG and git to sync";
-                      homepage = "https://gitlab.com/timvisee/prs";
-                      changelog = "https://gitlab.com/timvisee/prs/-/blob/v${version}/CHANGELOG.md";
-                      license = with licenses; [
-                        lgpl3Only # lib
-                        gpl3Only # everything else
-                      ];
-                      maintainers = with maintainers; [ dotlambda ];
-                      mainProgram = "prs";
-                    };
-                  };
-
                 local-xwayland = pkgs.writeShellScriptBin "local-xwayland" ''
                   set -x
                   ${pkgs.wayland-proxy-virtwl}/bin/wayland-proxy-virtwl \
@@ -293,12 +259,6 @@
 
                 inherit (inputs'.colmena.packages) colmena;
 
-                prs = pkgs.callPackage _prsPackage {
-                  src = inputs.prs;
-                  version = inputs.prs.shortRev;
-                  cargoHash = "sha256-oXuAKOHIfwUvcS0qXDTe68DN+MUNS4TAKV986vxdeh8=";
-                };
-
                 nomad = inputs'.nixpkgs-unstable.legacyPackages.nomad_1_6;
 
                 ledger-live-desktop-wrapped = pkgs.writeShellScriptBin "ledger-live-desktop-wrapped" ''