From d7b2a034aac44c83098ee098c1479e75dc0578da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sun, 7 Jul 2024 11:18:41 +0300
Subject: [PATCH 1/2] NixOS: bump to 24.05

- remove hopenpgp-tools (as per README)
- add dirmgr
- add rng-tools
---
 flake.lock |  8 ++++----
 flake.nix  | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index bf452f1..6d6b0f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,16 +18,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1706826059,
-        "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=",
+        "lastModified": 1720110830,
+        "narHash": "sha256-E5dN9GDV4LwMEduhBLSkyEz51zM17XkWZ3/9luvNOPs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d",
+        "rev": "c0d0be00d4ecc4b51d2d6948e37466194c1e6c51",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index b526a13..a814b87 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "A Nix Flake for an xfce-based system with YubiKey setup";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     drduhConfig.url = "github:drduh/config";
     drduhConfig.flake = false;
   };
@@ -129,7 +129,7 @@
                   enable = true;
                   virtualHosts."diceware.local" = {
                     listen = [
-                        {
+                      {
                         addr = dicewareAddress;
                         port = dicewarePort;
                       }
@@ -153,9 +153,12 @@
                   preferencesStatus = "user";
                 };
                 ssh.startAgent = false;
-                gnupg.agent = {
-                  enable = true;
-                  enableSSHSupport = true;
+                gnupg = {
+                  dirmngr.enable = true;
+                  agent = {
+                    enable = true;
+                    enableSSHSupport = true;
+                  };
                 };
               };
 
@@ -196,12 +199,12 @@
 
                 # Testing
                 ent
-                haskellPackages.hopenpgp-tools
 
                 # Password generation tools
                 diceware
                 dicewareWebApp
                 pwgen
+                rng-tools
 
                 # Might be useful beyond the scope of the guide
                 cfssl

From d5ef6565ed36ef496935e6e313225a8d75907190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sun, 7 Jul 2024 11:25:10 +0300
Subject: [PATCH 2/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'drduhConfig':
    'github:drduh/config/8c21617100795fea2313656abdf25f93b98fdc30' (2023-10-16)
  → 'github:drduh/config/4eca229664d056737f1a097cdbdb10e5f247b0bc' (2024-06-30)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6d6b0f5..f7dcb74 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "drduhConfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1697417581,
-        "narHash": "sha256-R45L/Xv3z0lJhGt781wDbjaq1qc+sGTmsUt+XHwgf4A=",
+        "lastModified": 1719781410,
+        "narHash": "sha256-cmtAG7UQX7mVNoHHpVIqasfkjnO7VtBMcz8MJ7frO0k=",
         "owner": "drduh",
         "repo": "config",
-        "rev": "8c21617100795fea2313656abdf25f93b98fdc30",
+        "rev": "4eca229664d056737f1a097cdbdb10e5f247b0bc",
         "type": "github"
       },
       "original": {