From 5f6b34802b7b3c7495fc50c868252a8fc27bcdfb Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 2 Apr 2016 14:11:27 +0200 Subject: profiles/workstation: Move to new gpg-agent module The obsolete option services.xserver.startGnuPGAgent is now no longer available and we have our own module now, so let's bite the dust and enable it, especially because I haven't tested it outside of the scope of the VM test. Signed-off-by: aszlig --- modules/user/aszlig/profiles/workstation/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix index 804d25f6..a2b01b35 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -102,6 +102,9 @@ in { }; }; + vuizvui.programs.gpg-agent.enable = true; + vuizvui.programs.gpg-agent.sshSupport = true; + services = { openssh = { enable = true; @@ -131,8 +134,6 @@ in { enable = true; layout = "dvorak"; - startGnuPGAgent = true; - displayManager.sessionCommands = '' ${pkgs.redshift}/bin/redshift -l 48.428404:10.866007 & ${pkgs.xorg.xrdb}/bin/xrdb "${pkgs.writeText "xrdb.config" '' -- cgit 1.4.1