From 929e4a0bfc2757220d63bb7878c734a267faa95c Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Mon, 29 Aug 2022 20:33:59 +0300
Subject: [PATCH] Setup SSH MasterSocker and other small improvements

---
 config.toml                      |  9 ++++-----
 home/.config/zsh/01-env.zsh      | 15 ++++++---------
 home/.ssh/authorized_keys        |  1 -
 home/.ssh/config                 |  7 +++++++
 home/.ssh/id_ed25519_yubikey.pub |  1 +
 5 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 home/.ssh/id_ed25519_yubikey.pub

diff --git a/config.toml b/config.toml
index 893dfee1..a8f6a11e 100644
--- a/config.toml
+++ b/config.toml
@@ -59,9 +59,9 @@ src = ".mbsyncrc"
 dst = "~/.config/alacritty/alacritty.yml"
 src = ".config/alacritty/alacritty.yml"
 
-[dotfiles.f_authorized_keys]
-dst = "~/.ssh/authorized_keys"
-src = ".ssh/authorized_keys"
+[dotfiles.d_ssh]
+dst = "~/.ssh"
+src = ".ssh"
 
 [dotfiles.f_beets_config]
 dst = "~/.config/beets/config.yaml"
@@ -242,9 +242,9 @@ os = "termux"
 [profiles.terminal]
 dotfiles = [
   "d_nvim",
+  "d_ssh",
   "d_zsh",
   "f_alacritty.yml",
-  "f_authorized_keys",
   "f_gitconfig",
   "f_hushlogin",
   "f_ignore",
@@ -252,7 +252,6 @@ dotfiles = [
   "f_ranger.conf",
   "f_ranger_commands.py",
   "f_rtv.cfg",
-  "f_ssh.conf",
   "f_tmux.conf",
   "f_zshrc",
 ]
diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh
index 43adace8..1de682b9 100644
--- a/home/.config/zsh/01-env.zsh
+++ b/home/.config/zsh/01-env.zsh
@@ -58,19 +58,16 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!"
 export SYSTEMD_EDITOR=$EDITOR
 export SYSTEMD_PAGER=less
 
-# Use GPG for SSH authentication
-export GPG_TTY="$(tty)"
-
-{%@@ if os == "arch" @@%}
-# set SSH_AUTH_SOCK if not logging in over SSH
 if [ "$SSH_CONNECTION" = "" ]; then
+{%@@ if os == "arch" or os == "ubuntu" @@%}
+	# set SSH_AUTH_SOCK if not logging in over SSH
+	export GPG_TTY="$(tty)"
     export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-    #gpgconf --launch gpg-agent
-    gpg-connect-agent updatestartuptty /bye >/dev/null
-fi
+    gpgconf --launch gpg-agent
 {%@@ elif os == "termux" @@%}
-eval $(okc-ssh-agent)
+	eval $(okc-ssh-agent)
 {%@@ endif @@%}
+fi
 
 # Enable grc colorization of supported commands
 [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh
diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys
index a0c28ee9..9bd02835 100644
--- a/home/.ssh/authorized_keys
+++ b/home/.ssh/authorized_keys
@@ -1,2 +1 @@
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvsd9UtWtqfG+vmx9ByEwQwKJlcelWwZlN4b4WG0al3 backup
diff --git a/home/.ssh/config b/home/.ssh/config
index 8d759296..d275a29e 100644
--- a/home/.ssh/config
+++ b/home/.ssh/config
@@ -1,5 +1,12 @@
 Include ~/.ssh/rossum_hosts
 
+host *
+	IdentitiesOnly yes
+	IdentityFile ~/.ssh/id_ed25519_yubikey.pub
+	ControlMaster auto
+	ControlPersist 10m
+	ControlPath ~/.ssh/%r@%h:%p.socket
+
 host gitea
 	HostName korhonen.cc
 	user git
diff --git a/home/.ssh/id_ed25519_yubikey.pub b/home/.ssh/id_ed25519_yubikey.pub
new file mode 100644
index 00000000..9bd02835
--- /dev/null
+++ b/home/.ssh/id_ed25519_yubikey.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey