Magit: Fix pinentry not recognised

This commit is contained in:
Swarsel 2024-05-22 03:33:20 +02:00
parent 60eb5e4b35
commit ca08aef2ad
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
9 changed files with 39 additions and 6 deletions

View file

@ -1537,6 +1537,9 @@ In order to update the language grammars, run the next command below.
:custom
(magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) ; stay in the same window
;; yubikey support for pushing commits
;; commiting is enabled through nixos gpg-agent config
(setenv "SSH_AUTH_SOCK" (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))
#+end_src
** Forge

View file

@ -137,6 +137,10 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry-gtk2;
extraConfig = ''
allow-emacs-pinentry
allow-loopback-pinentry
'';
};
#+end_src
@ -1343,6 +1347,7 @@ New setup for the SP3, this time using NixOS - another machine will take over th
];
allowedUDPPortRanges = [
{from = 27000; to = 27031;} # barotrauma
{from = 58962; to = 58964;} # barotrauma
];
};
};

View file

@ -8,6 +8,10 @@
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry-gtk2;
extraConfig = ''
allow-emacs-pinentry
allow-loopback-pinentry
'';
};
home = {

View file

@ -8,6 +8,10 @@
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry-gtk2;
extraConfig = ''
allow-emacs-pinentry
allow-loopback-pinentry
'';
};
home = {

View file

@ -38,6 +38,7 @@
];
allowedUDPPortRanges = [
{from = 27000; to = 27031;} # barotrauma
{from = 58962; to = 58964;} # barotrauma
];
};
};

View file

@ -8,6 +8,10 @@
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry-gtk2;
extraConfig = ''
allow-emacs-pinentry
allow-loopback-pinentry
'';
};

View file

@ -8,6 +8,10 @@
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry-gtk2;
extraConfig = ''
allow-emacs-pinentry
allow-loopback-pinentry
'';
};

View file

@ -8,6 +8,10 @@
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry-gtk2;
extraConfig = ''
allow-emacs-pinentry
allow-loopback-pinentry
'';
};

View file

@ -1127,6 +1127,10 @@
:custom
(magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) ; stay in the same window
;; yubikey support for pushing commits
;; commiting is enabled through nixos gpg-agent config
(setenv "SSH_AUTH_SOCK" (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))
(use-package forge
:after magit)