From 6952570818a8057fb1ad162d9116762b2aa6ae96 Mon Sep 17 00:00:00 2001
From: foehammer127 <foehammer@disroot.org>
Date: Tue, 3 Jun 2025 20:44:40 -0500
Subject: [PATCH] Update to 25.05.

---
 machines/lebesgue/deploy     |  2 +-
 machines/lebesgue/flake.lock | 21 ++++++++++-----------
 machines/lebesgue/flake.nix  |  4 ++--
 nixos/flake.nix              |  2 +-
 nixos/keys/foehammer.nix     |  2 +-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/machines/lebesgue/deploy b/machines/lebesgue/deploy
index a9bb2ac..5e6d86a 100755
--- a/machines/lebesgue/deploy
+++ b/machines/lebesgue/deploy
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 function deploy() {
-	nixos-rebuild $1 --flake .#default --target-host admin@lebesgue --use-remote-sudo --build-host localhost --verbose
+	nixos-rebuild $1 --flake .#default --target-host admin@lebesgue --use-remote-sudo --verbose
 }
 
 nix flake lock --update-input common
diff --git a/machines/lebesgue/flake.lock b/machines/lebesgue/flake.lock
index 6fb1f06..b32b680 100644
--- a/machines/lebesgue/flake.lock
+++ b/machines/lebesgue/flake.lock
@@ -6,15 +6,14 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-uIYrsEvn8S2Y48cqYAMGtppnrBII5jphGPuu1atjJ9E=",
         "path": "../../nixos",
         "type": "path"
       },
       "original": {
         "path": "../../nixos",
         "type": "path"
-      }
+      },
+      "parent": []
     },
     "flake-parts": {
       "inputs": {
@@ -51,16 +50,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738843498,
-        "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
+        "lastModified": 1748889542,
+        "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
+        "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -79,16 +78,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1738435198,
-        "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
+        "lastModified": 1748889542,
+        "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
+        "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/machines/lebesgue/flake.nix b/machines/lebesgue/flake.nix
index dac8a7d..8f008bb 100644
--- a/machines/lebesgue/flake.nix
+++ b/machines/lebesgue/flake.nix
@@ -2,7 +2,7 @@
   inputs = {
     common.url = "path:../../nixos";
 
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
 
     sops-nix = {
       url = "github:Mic92/sops-nix";
@@ -35,7 +35,7 @@
       pkgs = buildNixpkgs system;
     in {
       default = pkgs.mkShell {
-        buildInputs = with pkgs; [sops];
+        buildInputs = with pkgs; [sops nixos-rebuild];
       };
     });
   };
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 76a52e6..d123342 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
   };
diff --git a/nixos/keys/foehammer.nix b/nixos/keys/foehammer.nix
index 56f42e2..e703994 100644
--- a/nixos/keys/foehammer.nix
+++ b/nixos/keys/foehammer.nix
@@ -1,5 +1,5 @@
 {
-  leni = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE8KV91FpgTjTySEvM1Wj3eDrM8PpVZ6qoOHyAvDOdIj foehammer@euclid";
+  leni = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDTIngMpTALLFEU4bDnPWCy7mznZZiPWw9vuYEAJ5zA0 foehammer@lorenzo-leni";
 
   yubikey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtCcKS1jN/WSb4Ggvpz11pkUdE4kMgrN0xwptXLgSBX openpgp:0x79EFAC41";
 }