commit 685b83f1681f52a7203af6e1188c4d80a738a9f6 · kitten.sh/system

+1

flake.nix

···

       163
       163
        
             inherit (inputs.darwin.packages.${system}) darwin-rebuild;

     

       164
       164
        
           } // {

     

       165
       165
        
             inherit (pkgs)

     

       166
       166
       +
               pinentry-touchid

     

       166
       167
        
               steamworks-sdk-redist

     

       167
       168
        
               systemd-transparent-udp-forwarderd

     

       168
       169
        
               force-bind;

+6 -9

home/base/gpg.nix

···

       22
       22
        
             publicKeys = [

     

       23
       23
        
               { source = ./assets/pubring.asc; trust = "ultimate"; }

     

       24
       24
        
             ];

     

       25
       25
       -
             settings = {

     

       26
       26
       -
               default-key = "DDA4674BEB2FBE8A1EFB6F542FA66EDC2BFD54F5";

     

       27
       27
       -
               keyserver = "hkps://keys.openpgp.org";

     

       28
       28
       -
               keyserver-options = "auto-key-retrieve";

     

       29
       29
       -
             };

     

       30
       30
       -
             scdaemonSettings = {

     

       31
       31
       -
               disable-ccid = true;

     

       32
       32
       -
             };

     

       33
       25
        
           };

     

       34
       26
        
       

     

       35
       27
        
           services.gpg-agent = {

     

       36
       28
        
             enable = true;

     

       37
       29
        
             enableSshSupport = true;

     

       38
       30
        
             verbose = true;

     

       39
       39
       -
             pinentry.package = pkgs.pinentry_mac;

     

       40
       31
        
             sshKeys = [ "DDA4674BEB2FBE8A1EFB6F542FA66EDC2BFD54F5" ];

     

       32
       32
       +
             defaultCacheTtl = 1;

     

       33
       33
       +
             defaultCacheTtlSsh = 1;

     

       34
       34
       +
             pinentry = helpers.mkIfDarwin {

     

       35
       35
       +
               package = pkgs.pinentry-touchid;

     

       36
       36
       +
               program = "pinentry-touchid";

     

       37
       37
       +
             };

     

       41
       38
        
           };

     

       42
       39
        
       

     

       43
       40
        
           systemd.user.services.gpg-agent.Service.Slice = "session.slice";

+1

lib/pkgs/default.nix

···

       10
       10
        
         force-bind = import ./force-bind-seccomp.nix self super;

     

       11
       11
        
         steamworks-sdk-redist = import ./steamworks-sdk-redist.nix self super;

     

       12
       12
        
         palworld-server = import ./palworld-server.nix self super;

     

       13
       13
       +
         pinentry-touchid = import ./pinentry-touchid.nix self super;

     

       13
       14
        
       }

+40

lib/pkgs/pinentry-touchid.nix

···

       1
       1
       +
       self: pkgs @ {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildGoModule,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       with lib;

     

       9
       9
       +
       buildGoModule rec {

     

       10
       10
       +
         pname = "pinentry-touchid";

     

       11
       11
       +
         version = "v0.0.5";

     

       12
       12
       +
         vendorHash = "sha256-3NeKIdsZ7uQQmVXDZ6zUQ0QMF4uxFcUDEOHbPSqoqOg=";

     

       13
       13
       +
         proxyVendor = true;

     

       14
       14
       +
       

     

       15
       15
       +
         doCheck = false;

     

       16
       16
       +
         doInstallCheck = true;

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "kitten";

     

       20
       20
       +
           repo = "pinentry-touchid";

     

       21
       21
       +
           rev = "07322ff7e6509a575ce282aeb3b47db74a142a18";

     

       22
       22
       +
           sha256 = "sha256-anSdpuUbB1VIIaU28kIqLjsdIEAgHxgzSf0g68MK2as=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         subPackages = [ "." ];

     

       26
       26
       +
         buildInputs = with pkgs; [ makeBinaryWrapper ];

     

       27
       27
       +
         nativeBuildInputs = with pkgs; [ pinentry_mac writableTmpDirAsHomeHook ];

     

       28
       28
       +
         ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ];

     

       29
       29
       +
       

     

       30
       30
       +
         patchPhase = ''

     

       31
       31
       +
           substituteInPlace go.mod \

     

       32
       32
       +
             --replace-fail "=> ./go-assuan" "=> $src/go-assuan" \

     

       33
       33
       +
             --replace-fail "=> ./go-touchid" "=> $src/go-touchid"

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         postInstall = ''

     

       37
       37
       +
           wrapProgram $out/bin/pinentry-touchid \

     

       38
       38
       +
             --prefix PATH : ${pkgs.pinentry_mac}/bin

     

       39
       39
       +
         '';

     

       40
       40
       +
       }

+2

modules/base/macos.nix

···

       57
       57
        
               "com.apple.TimeMachine".DoNotOfferNewDisksForBackup = true;

     

       58
       58
        
               "com.apple.ImageCapture".disableHotPlug = true;

     

       59
       59
        
               "com.apple.gamed".Disabled = true;

     

       60
       60
       +
               "org.gpgtools.common".DisableKeychain = true;

     

       61
       61
       +
               "org.gpgtools.common".UseKeychain = false;

     

       60
       62
        
               "com.apple.dt.XCode".IDEIndexDisable = 1;

     

       61
       63
        
             };

     

       62
       64
        
           };