Updated

modules/nixos/tools/eza/default.nix

@@ -1,8 +1,6 @@
 {
-  options,
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
@@ -18,7 +16,6 @@ in {
         enable = true;
         icons = true;
         git = true;
-        enableAliases = true;
       };
     };
   };

modules/nixos/tools/gpg/default.nix

@@ -1,5 +1,4 @@
 {
-  options,
   config,
   pkgs,
   lib,
@@ -7,14 +6,13 @@
 }:
 with lib; let
   cfg = config.aa.tools.gpg;
-  user = config.aa.user;
 in {
   options.aa.tools.gpg = with types; {
     enable = mkEnableOption "gpg";
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [gnupg pinentry-curses];
+    environment.systemPackages = [pkgs.gnupg ];
 
     aa.home.extraOptions = {
       programs.gpg = {
@@ -32,7 +30,7 @@ in {
 
       services.gpg-agent = {
         enable = true;
-        pinentryFlavor = "curses";
+        pinentryPackage = pkgs.pinentry-curses;
         enableZshIntegration = true; # TODO: Only set if using zsh
         enableSshSupport = true;
         sshKeys = [

modules/nixos/tools/zsh/default.nix

@@ -1,5 +1,4 @@
 {
-  options,
   config,
   lib,
   pkgs,
@@ -20,7 +19,7 @@ in {
     aa.home.extraOptions = {
       programs.zsh = {
         enable = true;
-        enableAutosuggestions = true;
+        autosuggestion.enable = true;
         enableCompletion = true;
         envExtra = ''
           export PATH=~/.local/bin:$PATH