From 0049e6aae63e57d7339fb75c6d1c8cf549d944c3 Mon Sep 17 00:00:00 2001
From: buffet <dev@buffet.sh>
Date: Mon, 17 Jun 2024 10:47:59 +0200
Subject: [PATCH 1/2] build(flake): upgrade to nixos-24.05

---
 flake.lock | 16 ++++++++--------
 flake.nix  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 164a9e4..8058f3a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -148,16 +148,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1717476296,
-        "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=",
+        "lastModified": 1718530513,
+        "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a",
+        "rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -243,16 +243,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717880976,
-        "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
+        "lastModified": 1718437845,
+        "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
+        "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e",
         "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 b2a704c..369e71c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,7 @@
   inputs = {
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     nur.url = "github:nix-community/NUR";
 
     agenix = {
@@ -37,7 +37,7 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-- 
2.46.0


From 889ffe6889819bf423433d56f04709b4dc2d8a25 Mon Sep 17 00:00:00 2001
From: buffet <dev@buffet.sh>
Date: Mon, 17 Jun 2024 10:48:47 +0200
Subject: [PATCH 2/2] chore: rename options to fix 24.05 things

---
 hosts/alice/gpg.nix     | 4 ++--
 hosts/alice/printer.nix | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hosts/alice/gpg.nix b/hosts/alice/gpg.nix
index a2569ce..99b7db6 100644
--- a/hosts/alice/gpg.nix
+++ b/hosts/alice/gpg.nix
@@ -1,7 +1,7 @@
-{
+{pkgs, ...}: {
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
-    pinentryFlavor = "gnome3";
+    pinentryPackage = pkgs.pinentry-gnome3;
   };
 }
diff --git a/hosts/alice/printer.nix b/hosts/alice/printer.nix
index 1711e39..d22a66f 100644
--- a/hosts/alice/printer.nix
+++ b/hosts/alice/printer.nix
@@ -9,7 +9,8 @@
 
     avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
+      nssmdns6 = true;
       openFirewall = true;
     };
   };
-- 
2.46.0