Personal Nix setup

Revert pinentry fork

Changed files
+9 -11
home
base
lib
+2 -3
home/base/gpg.nix
···
enableSshSupport = true;
enableScDaemon = false;
verbose = true;
-
defaultCacheTtl = 20;
-
defaultCacheTtlSsh = 20;
maxCacheTtl = 60;
maxCacheTtlSsh = 60;
-
noAllowExternalCache = true;
pinentry = mkMerge [
(helpers.mkIfDarwin {
package = pkgs.pinentry-touchid;
···
enableSshSupport = true;
enableScDaemon = false;
verbose = true;
+
defaultCacheTtl = 10;
+
defaultCacheTtlSsh = 10;
maxCacheTtl = 60;
maxCacheTtlSsh = 60;
pinentry = mkMerge [
(helpers.mkIfDarwin {
package = pkgs.pinentry-touchid;
+7 -8
lib/pkgs/pinentry-touchid.nix
···
with lib;
buildGoModule rec {
pname = "pinentry-touchid";
-
version = "v0.0.5";
-
vendorHash = "sha256-3NeKIdsZ7uQQmVXDZ6zUQ0QMF4uxFcUDEOHbPSqoqOg=";
proxyVendor = true;
doCheck = false;
doInstallCheck = true;
src = fetchFromGitHub {
-
owner = "kitten";
repo = "pinentry-touchid";
-
rev = "07322ff7e6509a575ce282aeb3b47db74a142a18";
-
sha256 = "sha256-anSdpuUbB1VIIaU28kIqLjsdIEAgHxgzSf0g68MK2as=";
};
subPackages = [ "." ];
buildInputs = with pkgs; [ makeBinaryWrapper ];
-
nativeBuildInputs = with pkgs; [ pinentry_mac writableTmpDirAsHomeHook ];
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ];
patchPhase = ''
substituteInPlace go.mod \
-
--replace-fail "=> ./go-assuan" "=> $src/go-assuan" \
-
--replace-fail "=> ./go-touchid" "=> $src/go-touchid"
'';
postInstall = ''
···
with lib;
buildGoModule rec {
pname = "pinentry-touchid";
+
version = "v0.0.4";
+
vendorHash = "sha256-v3JtUk94/javwhtUsPUFV9EwFfaixZpb4AqKpCEaZp4=";
proxyVendor = true;
doCheck = false;
doInstallCheck = true;
src = fetchFromGitHub {
+
owner = "lujstn";
repo = "pinentry-touchid";
+
rev = "v0.0.4";
+
sha256 = "sha256-2+AuUbyA1CZQROjX/Wlcx+OVsvOQgli5oPjAEdKB1Gk=";
};
subPackages = [ "." ];
buildInputs = with pkgs; [ makeBinaryWrapper ];
+
nativeBuildInputs = with pkgs; [ pinentry_mac ];
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ];
patchPhase = ''
substituteInPlace go.mod \
+
--replace-fail "=> ./go-assuan" "=> $src/go-assuan"
'';
postInstall = ''