From 8d0220a7c81a62d87187608e6064a3f37356116d Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 3 Apr 2016 13:00:28 +0200
Subject: machines/katara: fix gpg-agent

---
 machines/profpatsch/katara.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'machines')

diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index 8c864465..c452d999 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -93,7 +93,7 @@ in {
       xPkgs = [
         dmenu             # simple UI menu builder
         dunst             # notification daemon (implements libnotify)
-        i3lock            # lock screen
+        alock             # lock screen
         libnotify         # notification library
         lxappearance      # GTK theme chooser
         myPkgs.taffybar   # status bar
@@ -256,6 +256,9 @@ in {
             #TODO add as nixpkg
             export PATH+=":$HOME/scripts" #add utility scripts
             export EDITOR=emacsclient
+
+            eval $(gpg-agent --daemon --enable-ssh-support)
+
             xset r rate 250 35
             set-background &
             # TODO xbindkeys user service file
@@ -265,8 +268,6 @@ in {
             '';
       };
 
-      startGnuPGAgent = true;
-
     };
 
     fonts.fontconfig = {
@@ -322,11 +323,18 @@ in {
     ###########
     # Programs
 
-    # see gpgAgent
+    # use gpg-agent
     programs.ssh.startAgent = false;
 
     # friendly user shell
-    programs.fish.enable = true;
+    programs.fish = {
+      enable = true;
+      # gpg-agent; TODO: move to module
+      shellInit = ''
+        set -x GPG_TTY (tty)
+      '';
+    };
+
 
     vuizvui.user.profpatsch.programs.scanning.enable = true;
 
-- 
cgit 1.4.1