Don't take over the daemon on start
This commit is contained in:
parent
b100b22e28
commit
44021e3df2
|
@ -35,8 +35,8 @@ in
|
||||||
set -eg MESA_GL_VERSION_OVERRIDE
|
set -eg MESA_GL_VERSION_OVERRIDE
|
||||||
set -eg MESA_GLSL_VERSION_OVERRIDE
|
set -eg MESA_GLSL_VERSION_OVERRIDE
|
||||||
|
|
||||||
export GNOME_KEYRING_CONTROL=/run/user/1001/keyring
|
# export GNOME_KEYRING_CONTROL=/run/user/1001/keyring
|
||||||
export SSH_AUTH_SOCK=/run/user/1001/keyring/ssh
|
# export SSH_AUTH_SOCK=/run/user/1001/keyring/ssh
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# More packages
|
# More packages
|
||||||
|
|
|
@ -38,6 +38,7 @@ in
|
||||||
deluge # Torrent client
|
deluge # Torrent client
|
||||||
pavucontrol # PulseAudio control panel
|
pavucontrol # PulseAudio control panel
|
||||||
firefox
|
firefox
|
||||||
|
librewolf
|
||||||
cinnamon.nemo # File manager
|
cinnamon.nemo # File manager
|
||||||
thunderbird # Email
|
thunderbird # Email
|
||||||
|
|
||||||
|
|
|
@ -319,7 +319,7 @@ in
|
||||||
|
|
||||||
'' + (if config.services.gnome-keyring.enable then ''
|
'' + (if config.services.gnome-keyring.enable then ''
|
||||||
# gnome-keyring
|
# gnome-keyring
|
||||||
eval `gnome-keyring-daemon -r -d -c secrets,ssh,pkcs11`
|
eval `gnome-keyring-daemon`
|
||||||
export SSH_AUTH_SOCK
|
export SSH_AUTH_SOCK
|
||||||
'' else "");
|
'' else "");
|
||||||
# Extra
|
# Extra
|
||||||
|
|
Loading…
Reference in a new issue