ma zsh: disable home-manager gpg-agent and use programs.gpg-agent

This commit is contained in:
makefu 2020-04-23 16:44:47 +02:00
parent 9341a6e3a2
commit 0c3b57081d
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 7 additions and 11 deletions

View File

@ -1,15 +1,6 @@
{pkgs, ... }: { {pkgs, ... }: {
imports = [ ./zsh.nix ]; imports = [ ./zsh.nix ];
home-manager.users.makefu = { home-manager.users.makefu = {
services.gpg-agent = {
enable = true;
defaultCacheTtl = 900;
maxCacheTtl = 7200;
defaultCacheTtlSsh = 3600;
maxCacheTtlSsh = 86400;
enableSshSupport = true;
enableScDaemon = true;
};
programs.direnv = { programs.direnv = {
stdlib = '' stdlib = ''
use_nix() { use_nix() {

View File

@ -1,5 +1,12 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs = {
ssh.startAgent = false;
gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
};
imports = [ imports = [
{ #direnv { #direnv
home-manager.users.makefu.home.packages = [ pkgs.direnv pkgs.nur.repos.kalbasit.nixify ]; home-manager.users.makefu.home.packages = [ pkgs.direnv pkgs.nur.repos.kalbasit.nixify ];
@ -54,8 +61,6 @@
setopt HIST_IGNORE_SPACE setopt HIST_IGNORE_SPACE
setopt HIST_FIND_NO_DUPS setopt HIST_FIND_NO_DUPS
unset SSH_AGENT_PID
export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
compdef _pass brain compdef _pass brain
zstyle ':completion::complete:brain::' prefix "$HOME/brain" zstyle ':completion::complete:brain::' prefix "$HOME/brain"
compdef _pass secrets compdef _pass secrets