Setup SSH MasterSocker and other small improvements

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",
 ]

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

home/.ssh/authorized_keys

@@ -1,2 +1 @@
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvsd9UtWtqfG+vmx9ByEwQwKJlcelWwZlN4b4WG0al3 backup

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

home/.ssh/id_ed25519_yubikey.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey