about summary refs log tree commit diff
path: root/modules/user
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-04-02 14:11:27 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-04-02 14:11:27 +0200
commit5f6b34802b7b3c7495fc50c868252a8fc27bcdfb (patch)
treed716477a10704a30346762cf54c8bd611e1cd879 /modules/user
parent8db1803b5d9865b2355fabdb6bb974d879ce57cc (diff)
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/aszlig/profiles/workstation/default.nix5
1 files changed, 3 insertions, 2 deletions
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" ''