mirror of
https://codeberg.org/privacy1st/nix-git
synced 2024-11-21 22:03:19 +01:00
fix: ssh smartcard gpg-agent
This commit is contained in:
parent
54307d3927
commit
9c68a345f2
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
# Use NitroKey USB smartcard with SSH.
|
# Use NitroKey USB smartcard with SSH.
|
||||||
# https://nixos.wiki/wiki/Nitrokey
|
# https://nixos.wiki/wiki/Nitrokey
|
||||||
@ -101,8 +101,9 @@
|
|||||||
# https://wiki.archlinux.org/title/GnuPG#GNOME_on_Wayland_overrides_SSH_agent_socket
|
# https://wiki.archlinux.org/title/GnuPG#GNOME_on_Wayland_overrides_SSH_agent_socket
|
||||||
#
|
#
|
||||||
# Solution 1: https://github.com/NixOS/nixpkgs/issues/42291#issuecomment-399630199
|
# Solution 1: https://github.com/NixOS/nixpkgs/issues/42291#issuecomment-399630199
|
||||||
|
# Works for me.
|
||||||
# Solution 2: https://github.com/NixOS/nixpkgs/issues/42291#issuecomment-687979733
|
# Solution 2: https://github.com/NixOS/nixpkgs/issues/42291#issuecomment-687979733
|
||||||
services.gnome.gnome-keyring.enable = pkgs.lib.mkForce false;
|
# Works for me, but on each login, nextcloud-desktop asks for credentials ...
|
||||||
|
|
||||||
# Adds the pinentry binary to the PATH so that e.g.
|
# Adds the pinentry binary to the PATH so that e.g.
|
||||||
# echo GETPIN | pinentry
|
# echo GETPIN | pinentry
|
||||||
@ -143,6 +144,16 @@
|
|||||||
|
|
||||||
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
|
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
|
||||||
|
|
||||||
|
# Disable GNOME Keyring. See comment above.
|
||||||
|
#
|
||||||
|
# Prevent clobbering SSH_AUTH_SOCK
|
||||||
|
home.sessionVariables.GSM_SKIP_SSH_AGENT_WORKAROUND = "1";
|
||||||
|
# Disable gnome-keyring ssh-agent
|
||||||
|
xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = ''
|
||||||
|
${lib.fileContents "${pkgs.gnome3.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"}
|
||||||
|
Hidden=true
|
||||||
|
'';
|
||||||
|
|
||||||
# GnuPG configuration.
|
# GnuPG configuration.
|
||||||
programs.gpg = {
|
programs.gpg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user