From 3d6537dfe50ff6e2f236e40cc2399c6c7379618e Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 1 Jun 2024 07:16:06 +0100
Subject: [PATCH 1/2] Update to nixos-24.05

Update pinentry to use package rather than string definition

Sway currently not building - to investigate
---
 flake.lock                          | 16 ++++++++--------
 flake.nix                           |  4 ++--
 home/default.nix                    |  2 +-
 programs/shell/default.nix          |  3 +--
 services/password-store/default.nix |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3ec84d2..abb1d91 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,16 +41,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1715381426,
-        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
+        "lastModified": 1716736833,
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -91,16 +91,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1716361217,
-        "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "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 aacaf9d..62a904e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,9 +7,9 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     iosevka-custom.url = "git+https://git.xenia.me.uk/pixelifytica/iosevka.git";
diff --git a/home/default.nix b/home/default.nix
index 5d87a0b..3e36769 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -24,7 +24,7 @@
   programs.home-manager.enable = true;
   nixpkgs.config.allowUnfree = true;
   services = {
-    gpg-agent.pinentryFlavor = "gtk2";
+    gpg-agent.pinentryPackage = pkgs.pinentry-gtk2;
     avizo.enable = true;
     syncthing.enable = true;
     udiskie = {
diff --git a/programs/shell/default.nix b/programs/shell/default.nix
index 5dc7285..10dc10f 100644
--- a/programs/shell/default.nix
+++ b/programs/shell/default.nix
@@ -32,7 +32,6 @@
     };
     eza = {
       enable = true;
-      enableAliases = true;
       git = true;
       icons = true;
       extraOptions = ["--octal-permissions"];
@@ -50,9 +49,9 @@
     zsh = {
       enable = true;
       enableCompletion = true;
-      enableAutosuggestions = true;
       enableVteIntegration = true;
       autocd = true;
+      autosuggestion.enable = true;
       defaultKeymap = "emacs";
       syntaxHighlighting = {
         enable = true;
diff --git a/services/password-store/default.nix b/services/password-store/default.nix
index 0cc4b29..1cb0f0f 100644
--- a/services/password-store/default.nix
+++ b/services/password-store/default.nix
@@ -28,7 +28,7 @@
       maxCacheTtl = 86400;
       defaultCacheTtl = maxCacheTtl;
       defaultCacheTtlSsh = maxCacheTtl;
-      pinentryFlavor = lib.mkDefault "curses";
+      pinentryPackage = lib.mkDefault pkgs.pinentry-curses;
       extraConfig = ''
         no-allow-external-cache
       '';

From 2c270c0cd57b0c606819b879a6e5c69dea2ac652 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Mon, 3 Jun 2024 05:26:43 +0100
Subject: [PATCH 2/2] Disable checkConfig for sway module

Fix https://github.com/nix-community/home-manager/issues/5379
---
 programs/desktop/sway/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/programs/desktop/sway/default.nix b/programs/desktop/sway/default.nix
index 9754c63..4b85fb7 100644
--- a/programs/desktop/sway/default.nix
+++ b/programs/desktop/sway/default.nix
@@ -14,6 +14,7 @@
     swaynag.enable = true;
     systemd.enable = true;
     xwayland = true;
+    checkConfig = false;
     config = {
       input = {
         "*" = {