From 43bfd1a5a247a536134cf11cf54844c26d40af6d Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 6 Oct 2021 21:26:24 +0300
Subject: [PATCH] Fixes for gpg-agent

---
 config.yaml                     | 12 ++++++------
 dotdrop                         |  2 +-
 home/.config/zsh/01-env.zsh     | 10 +++-------
 home/.config/zsh/03-aliases.zsh |  1 +
 home/.pam_environment           |  2 ++
 5 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 home/.pam_environment

diff --git a/config.yaml b/config.yaml
index d82bc86..269c607 100644
--- a/config.yaml
+++ b/config.yaml
@@ -172,9 +172,9 @@ dotfiles:
   f_electron12-flags.conf:
     src: .config/electron12-flags.conf
     dst: ~/.config/electron12-flags.conf
-  f_wayland.sh:
-    src: .config/plasma-workspace/env/wayland.sh
-    dst: ~/.config/plasma-workspace/env/wayland.sh
+  f_pam_environment:
+    src: .pam_environment
+    dst: ~/.pam_environment
 profiles:
   base:
     dotfiles:
@@ -189,6 +189,7 @@ profiles:
     - f_mailcap
     - d_zsh
     - f_zshrc
+    - f_pam_environment
     - f_tmux.conf
     - f_ranger.conf
     - f_ssh.conf
@@ -228,6 +229,8 @@ profiles:
     - f_tdesktop_lang.strings
     - f_fonts.conf
     - f_zprofile
+    - f_electron-flags.conf
+    - f_electron12-flags.conf
   Pacman:
     dotfiles:
     - f_makepkg.conf
@@ -247,9 +250,6 @@ profiles:
     - f_foot.ini
     - f_gpg-agent.conf
     - f_gpg.conf
-    - f_electron-flags.conf
-    - f_electron12-flags.conf
-    - f_wayland.sh
   Moria:
     include:
     - terminal
diff --git a/dotdrop b/dotdrop
index 55d7d56..06e9cde 160000
--- a/dotdrop
+++ b/dotdrop
@@ -1 +1 @@
-Subproject commit 55d7d5602e16edd44f9d4237da54134681402a61
+Subproject commit 06e9cde0be3afa4d59f4785bbcecbd3e9f9fd6ca
diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh
index f07a920..6c78708 100644
--- a/home/.config/zsh/01-env.zsh
+++ b/home/.config/zsh/01-env.zsh
@@ -22,9 +22,6 @@ setopt EXTENDED_HISTORY
 # Enable completions for aliases
 setopt complete_aliases
 
-# Use exa completions for ls
-compdef ls='exa'
-
 # Variable to pass to sdotdrop to get current user
 export USRNAME=$USER
 
@@ -62,11 +59,10 @@ export MANPAGER="nvim +Man!"
 
 # Use GPG for SSH authentication
 export GPG_TTY="$(tty)"
-# Fix for pinentry not working for ssh
-gpg-connect-agent updatestartuptty /bye >/dev/null
 
 # set SSH_AUTH_SOCK if not logging in over SSH
-if [ "$SSH_CONNECTION" -eq "" ]; then
+if [ "$SSH_CONNECTION" = "" ]; then
 	export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-	gpgconf --launch gpg-agent
+	#gpgconf --launch gpg-agent
+	gpg-connect-agent updatestartuptty /bye >/dev/null
 fi
diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh
index c0f82cc..0e57d18 100644
--- a/home/.config/zsh/03-aliases.zsh
+++ b/home/.config/zsh/03-aliases.zsh
@@ -24,6 +24,7 @@ _fzf_compgen_path() {
 # Modern replacements for cat and ls
 alias cat='bat --paging=never'
 alias ls='exa'
+compdef ls='exa'
 
 {%@@ if profile != "mko-laptop" @@%}
 # Command not found handler
diff --git a/home/.pam_environment b/home/.pam_environment
new file mode 100644
index 0000000..b55fba7
--- /dev/null
+++ b/home/.pam_environment
@@ -0,0 +1,2 @@
+SSH_AGENT_PID	DEFAULT=
+SSH_AUTH_SOCK	DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"