From 4dd844b1c92b6299a6971b462c5e18c974e80594 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 15 Mar 2024 00:27:16 +0000 Subject: [PATCH 1/3] flake: update nixpkgs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3030f185ba6a4bf4f18b87f345f104e6a6961f34' (2024-03-09) → 'github:NixOS/nixpkgs/0ad13a6833440b8e238947e47bea7f11071dc2b2' (2024-03-12) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/ddcd7598b2184008c97e6c9c6a21c5f37590b8d2' (2024-03-11) → 'github:NixOS/nixpkgs/878ef7d9721bee9f81f8a80819f9211ad1f993da' (2024-03-14) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3e395dc7..9476c0df 100644 --- a/flake.lock +++ b/flake.lock @@ -402,11 +402,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710162809, - "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=", + "lastModified": 1710420202, + "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2", + "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da", "type": "github" }, "original": { From 9a6c5af2ace261a4bfc06232855dc39baba8aec1 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 15 Mar 2024 05:10:15 -0400 Subject: [PATCH 2/3] flake: update home-manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/17431970b4ebc75a92657101ccffcfc9e1f9d8f0' (2024-03-08) → 'github:nix-community/home-manager/096d9c04b3e9438855aa65e24129b97a998bd3d9' (2024-03-14) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9476c0df..76999a01 100644 --- a/flake.lock +++ b/flake.lock @@ -268,11 +268,11 @@ ] }, "locked": { - "lastModified": 1709938482, - "narHash": "sha256-2Vw2WOFmEXWQH8ziFNOr0U48Guh5FacuD6BOEIcE99s=", + "lastModified": 1710452332, + "narHash": "sha256-+lKOoQ89fD6iz6Ro7Adml4Sx6SqQcTWII4t1rvVtdjs=", "owner": "nix-community", "repo": "home-manager", - "rev": "17431970b4ebc75a92657101ccffcfc9e1f9d8f0", + "rev": "096d9c04b3e9438855aa65e24129b97a998bd3d9", "type": "github" }, "original": { From fc17c8c89d6eae0f4a2f49ef0d80dc02fd2e865e Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 15 Mar 2024 05:17:38 -0400 Subject: [PATCH 3/3] seth: fixup removed options --- users/seth/module/programs/eza.nix | 1 - users/seth/module/programs/gpg.nix | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/users/seth/module/programs/eza.nix b/users/seth/module/programs/eza.nix index 4dc07ee7..6280651a 100644 --- a/users/seth/module/programs/eza.nix +++ b/users/seth/module/programs/eza.nix @@ -12,7 +12,6 @@ in { config = lib.mkIf cfg.enable { programs.eza = { enable = true; - enableAliases = true; icons = true; }; }; diff --git a/users/seth/module/programs/gpg.nix b/users/seth/module/programs/gpg.nix index b7b03c55..e7091806 100644 --- a/users/seth/module/programs/gpg.nix +++ b/users/seth/module/programs/gpg.nix @@ -16,11 +16,7 @@ in { services.gpg-agent = lib.mkIf pkgs.stdenv.isLinux { enable = true; - - pinentryFlavor = - if osConfig ? programs - then osConfig.programs.gnupg.agent.pinentryFlavor or "curses" - else "curses"; + pinentryPackage = osConfig.programs.gnupg.agent.pinentryPackage or pkgs.pinentry-curses; }; }; }