swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 09:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Magit: Fix pinentry not recognised

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
Emacs.org
View file

@ -1537,6 +1537,9 @@ In order to update the language grammars, run the next command below.
:custom :custom
(magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) ; stay in the same window (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 #+end_src
** Forge ** Forge

7
Nix.org
View file

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

6
profiles/TEMPLATE/home.nix
View file

@ -8,7 +8,11 @@
enableSshSupport = true; enableSshSupport = true;
enableExtraSocket = true; enableExtraSocket = true;
pinentryPackage = pkgs.pinentry-gtk2; pinentryPackage = pkgs.pinentry-gtk2;
}; extraConfig = ''
allow-emacs-pinentry
allow-loopback-pinentry
'';
};
home = { home = {
username = "TEMPLATE"; username = "TEMPLATE";

6
profiles/fourside/home.nix
View file

@ -8,7 +8,11 @@
enableSshSupport = true; enableSshSupport = true;
enableExtraSocket = true; enableExtraSocket = true;
pinentryPackage = pkgs.pinentry-gtk2; pinentryPackage = pkgs.pinentry-gtk2;
}; extraConfig = ''
allow-emacs-pinentry
allow-loopback-pinentry
'';
};
home = { home = {
username = "swarsel"; username = "swarsel";

1
profiles/fourside/nixos.nix
View file

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

6
profiles/onett/home.nix
View file

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

6
profiles/stand/home.nix
View file

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

6
profiles/threed/home.nix
View file

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

4
programs/emacs/init.el
View file

@ -1127,6 +1127,10 @@
:custom :custom
(magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) ; stay in the same window (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 (use-package forge
:after magit) :after magit)