From 0c3b57081d8439debb67d041e72815c5be5cc3f5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 23 Apr 2020 16:44:47 +0200
Subject: [PATCH] ma zsh: disable home-manager gpg-agent and use
programs.gpg-agent
---
makefu/2configs/home-manager/cli.nix | 9 ---------
makefu/2configs/home-manager/zsh.nix | 9 +++++++--
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/makefu/2configs/home-manager/cli.nix b/makefu/2configs/home-manager/cli.nix
index 6b5d26111..5d5673b81 100644
--- a/makefu/2configs/home-manager/cli.nix
+++ b/makefu/2configs/home-manager/cli.nix
@@ -1,15 +1,6 @@
{pkgs, ... }: {
imports = [ ./zsh.nix ];
home-manager.users.makefu = {
- services.gpg-agent = {
- enable = true;
- defaultCacheTtl = 900;
- maxCacheTtl = 7200;
- defaultCacheTtlSsh = 3600;
- maxCacheTtlSsh = 86400;
- enableSshSupport = true;
- enableScDaemon = true;
- };
programs.direnv = {
stdlib = ''
use_nix() {
diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 1f4ceea6c..f972e98b4 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -1,5 +1,12 @@
{ pkgs, ... }:
{
+ programs = {
+ ssh.startAgent = false;
+ gnupg.agent = {
+ enable = true;
+ enableSSHSupport = true;
+ };
+ };
imports = [
{ #direnv
home-manager.users.makefu.home.packages = [ pkgs.direnv pkgs.nur.repos.kalbasit.nixify ];
@@ -54,8 +61,6 @@
setopt HIST_IGNORE_SPACE
setopt HIST_FIND_NO_DUPS
- unset SSH_AGENT_PID
- export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
compdef _pass brain
zstyle ':completion::complete:brain::' prefix "$HOME/brain"
compdef _pass secrets