From 1957423a7bde3a2c5a49ee57fba9b78557447228 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 16 Mar 2024 11:56:24 +0000
Subject: [PATCH] Home-manager updates

pinentryFlavor -> pinentryPackage

eza.enableAliases replaced in favour to per-shell integration options,
all true by default anyway

zsh.enableAutosuggestions -> zsh.autosuggestion.enable
---
 flake.nix                       | 17 +++++++++--------
 home/default.nix                |  1 -
 home/hyprland/default.nix       |  2 +-
 home/password-store/default.nix |  2 +-
 home/zsh/default.nix            |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index 47ce9085..34822d9e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,15 +82,16 @@
               nixpkgs.config.allowUnfree = true;
               networking = {inherit hostName;};
               programs.${defaultUserShell}.enable = true;
-              stylix.fonts = let
-                font = name: {
-                  name = iosevka-custom.outputs.names."iosevka-custom-${name}";
-                  package = iosevka-custom.outputs.packages.${system}."iosevka-custom-${name}";
+              stylix.fonts = with iosevka-custom.outputs; rec {
+                serif = sansSerif;
+                sansSerif = {
+                  name = names."iosevka-custom-aile";
+                  package = packages.${system}."iosevka-custom-aile";
+                };
+                monospace = {
+                  name = names."iosevka-custom-nerdfont";
+                  package = packages.${system}."iosevka-custom-nerdfont";
                 };
-              in {
-                serif = font "etoile";
-                sansSerif = font "aile";
-                monospace = font "nerdfont";
               };
               system = {inherit stateVersion;};
               users = {
diff --git a/home/default.nix b/home/default.nix
index 83f20f4d..e7d4e03e 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -33,7 +33,6 @@
       enable = true;
       git = true;
       icons = true;
-      enableAliases = true;
       extraOptions = ["--octal-permissions"];
     };
     readline = {
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 3341e7ea..f3a92de2 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -37,7 +37,7 @@
     zellij.settings.copy_command = "wl-copy";
   };
   services = {
-    gpg-agent.pinentryFlavor = "gtk2";
+    gpg-agent.pinentryPackage = pkgs.pinentry-gtk2;
     avizo.enable = true;
     syncthing.enable = true;
     udiskie = {
diff --git a/home/password-store/default.nix b/home/password-store/default.nix
index 25de2ece..b760d55e 100644
--- a/home/password-store/default.nix
+++ b/home/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
       '';
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index f2f54691..c2b4b0f5 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -1,8 +1,8 @@
 {...}: {
   programs.zsh = {
     enable = true;
-    enableAutosuggestions = true;
     enableCompletion = true;
+    autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
     enableVteIntegration = true;
     autocd = true;