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: NixOS: bump to 24.05

- remove hopenpgp-tools (as per README)
- add dirmgr
- add rng-tools
---
 flake.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'flake.nix')

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
-- 
cgit v1.2.3