From 79745869b529c12e23dcc2b06d81f773c49abf83 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Tue, 2 Jul 2024 19:52:11 +0200
Subject: [PATCH 1/2] flake.lock: Update nixpkgs

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4aaa8c4..58bceda 100644
--- a/flake.lock
+++ b/flake.lock
@@ -268,11 +268,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1719254875,
-        "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
+        "lastModified": 1719848872,
+        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
+        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
         "type": "github"
       },
       "original": {

From e082168630107be13034fe4a80eb6c0d9a3d06b5 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Tue, 2 Jul 2024 19:53:21 +0200
Subject: [PATCH 2/2] Revert "configuration/common: Hotfix OpenSSH
 CVE-2024-6387"

This reverts commit 9455fefe5dd5a9a9ccb5a567135d04ad90c274f0.
---
 configuration/common/ssh.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/configuration/common/ssh.nix b/configuration/common/ssh.nix
index 110c670..e62aab5 100644
--- a/configuration/common/ssh.nix
+++ b/configuration/common/ssh.nix
@@ -7,9 +7,6 @@
     PasswordAuthentication = false;
     KbdInteractiveAuthentication = false;
     PermitRootLogin = lib.mkDefault "no";
-
-    # Hotfix CVE-2024-6387 https://github.com/NixOS/nixpkgs/pull/323753
-    LoginGraceTime = 0;
   };
   services.openssh.hostKeys = lib.mkForce [
     # Only create ed25519 host keys