kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-21 20:31:07 +01:00
Code Releases Activity

feat: gnome-keyring not via home-manager

Browse Source
This commit is contained in:
Kierán Meinhardt
2024-03-20 08:12:50 +01:00
parent 58c4f517c5
commit 491a13ed95
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configs/cloud.nix
View File

@@ -18,6 +18,7 @@ in {
]; ];
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
security.pam.services.lightdm.enableGnomeKeyring = true;
home-manager.users.me = { home-manager.users.me = {
services.nextcloud-client = { services.nextcloud-client = {

53
configs/ssh.nix
View File

@@ -4,33 +4,40 @@
in { in {
users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs; users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
programs.ssh.startAgent = true;
home-manager.users.me = { home-manager.users.me = {
services.gpg-agent = rec { # https://discourse.nixos.org/t/gnome-keyring-and-ssh-agent-without-gnome/11663
enable = true; xsession.profileExtra = ''
enableSshSupport = true; eval $(${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon --daemonize --components=ssh,secrets)
defaultCacheTtlSsh = 2 * 60 * 60; export SSH_AUTH_SOCK
maxCacheTtlSsh = 4 * defaultCacheTtlSsh; '';
sshKeys = [ # services.gpg-agent = rec {
"568047C91DE03A23883E340F15A9C24D313E847C" # enable = false;
"BB3EE102DB8CD45540A78A6B18B511B67061F6B4" # kfm@manakish ed25519 # enableSshSupport = true;
"3F8986755818B5762A096BE212777EAAC441DD9D" # fysiweb rsa # defaultCacheTtlSsh = 2 * 60 * 60;
"0E4ABD229432486CC432639BB0986B2CDE365105" # agenix ed25519 # maxCacheTtlSsh = 4 * defaultCacheTtlSsh;
"A1E8D32CBFCDBD2DE798E2298D795CCFD785AE06" # kfm@kabsa ed25519 # sshKeys = [
]; # "568047C91DE03A23883E340F15A9C24D313E847C"
}; # "BB3EE102DB8CD45540A78A6B18B511B67061F6B4" # kfm@manakish ed25519
# "3F8986755818B5762A096BE212777EAAC441DD9D" # fysiweb rsa
# "0E4ABD229432486CC432639BB0986B2CDE365105" # agenix ed25519
# "A1E8D32CBFCDBD2DE798E2298D795CCFD785AE06" # kfm@kabsa ed25519
# ];
# };
}; };
environment.extraInit = '' # environment.extraInit = ''
if [[ -z "$SSH_AUTH_SOCK" ]]; then # if [[ -z "$SSH_AUTH_SOCK" ]]; then
export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)" # export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)"
fi # fi
''; # '';
environment.interactiveShellInit = '' # environment.interactiveShellInit = ''
GPG_TTY="$(tty)" # GPG_TTY="$(tty)"
export GPG_TTY # export GPG_TTY
${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null # ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
''; # '';
home-manager.users.me.programs.ssh = { home-manager.users.me.programs.ssh = {
enable = true; enable = true;