From 100b59f2f611ed1339d67f244bb42d019d0c1e61 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Wed, 6 Nov 2024 07:28:26 +0700 Subject: [PATCH] refactor(nix): Move pass and gpg to common --- nix/lib/mkCommon.nix | 2 ++ nix/systems/darwin/configuration.nix | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nix/lib/mkCommon.nix b/nix/lib/mkCommon.nix index d5755c9..8a11462 100644 --- a/nix/lib/mkCommon.nix +++ b/nix/lib/mkCommon.nix @@ -18,5 +18,7 @@ in { pkgs.ruby pkgs._7zz pkgs.enchive + (pkgs.pass.withExtensions (exts: [ exts.pass-otp ])) + pkgs.gnupg ]; } diff --git a/nix/systems/darwin/configuration.nix b/nix/systems/darwin/configuration.nix index f99af12..a388ef8 100644 --- a/nix/systems/darwin/configuration.nix +++ b/nix/systems/darwin/configuration.nix @@ -40,10 +40,7 @@ in { (libFixup { package = pkgs.glib; inherit (pkgs) runCommandLocal; name = "glib"; }) (libFixup { package = pkgs.gettext; inherit (pkgs) runCommandLocal; name = "gettext"; }) - pkgs.pass - pkgs.passExtensions.pass-otp - pkgs.gnupg - pkgs.pinentry_mac + pkgs.pinentry_mac # for GPG common.custom.python #(pkgs.poetry.override { python3 = common.custom.python; })