3 files changed, 2 insertions, 58 deletions
diff --git a/.chezmoiremove b/.chezmoiremove
index ff30391..261612e 100644
--- a/.chezmoiremove
+++ b/.chezmoiremove
@@ -9,6 +9,8 @@
 bin/mutt
 .config/systemd/user/borgmatic@tosh.service.wants/backup-email@mail.cs.mcgill.ca.service
 .config/systemd/user/default.target.wants/swaybg-random.service
+.config/systemd/user/ssh-agent.service.d/*
+.config/systemd/user/ssh-agent.service.d
 .config/neomutt/news.rc
 .mbsyncrc
 .xkb
diff --git a/dot_config/systemd/user/ssh-agent.service.d/override.conf b/dot_config/systemd/user/ssh-agent.service.d/override.conf
deleted file mode 100644
index a3b6435..0000000
--- a/dot_config/systemd/user/ssh-agent.service.d/override.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenSSH Agent
-Documentation=man:ssh-agent(1)
-Before=basic.target
-ConditionPathExists=/etc/X11/Xsession.options
-Wants=dbus.socket
-After=dbus.socket
-
-[Service]
-ExecStart=
-ExecStart=/home/rak/.local/lib/openssh/agent-launch start
diff --git a/dot_local/lib/openssh/executable_agent-launch b/dot_local/lib/openssh/executable_agent-launch
deleted file mode 100644
index 36e06ff..0000000
--- a/dot_local/lib/openssh/executable_agent-launch
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# helper script for launching ssh-agent, used by systemd unit
-set -e
-
-options="$(getopt -o '' -l help -- "$@")" || exit 1
-eval set -- "$options"
-
-if [ ! -d "$XDG_RUNTIME_DIR" ]; then
-    # shellcheck disable=SC2016
-    echo 'This needs $XDG_RUNTIME_DIR to be set' >&2
-    exit 1
-fi
-
-while :; do
-    case $1 in
-        --help)
-            echo 'Usage:' >&2
-            echo "  $0 start [-- ssh-agent options]" >&2
-            echo "  $0 stop"
-            exit 0
-            ;;
-        --)
-            shift
-            break
-            ;;
-        *)
-            echo "Unexpected argument: $1" >&2
-            exit 1
-            ;;
-    esac
-done
-
-if [ "$1" = start ]; then
-    shift
-    if [ ! -S "$SSH_AUTH_SOCK" ] && grep -s -q '^use-ssh-agent$' /etc/X11/Xsession.options; then
-        S="$XDG_RUNTIME_DIR/openssh_agent"
-        dbus-update-activation-environment --verbose --systemd SSH_AUTH_SOCK="$S" SSH_AGENT_LAUNCHER=openssh
-        exec ssh-agent -D -a "$S" "$@"
-    fi
-elif [ "$1" = stop ]; then
-    if [ "$SSH_AGENT_LAUNCHER" = openssh ]; then
-        dbus-update-activation-environment --systemd  SSH_AUTH_SOCK=
-    fi
-else
-    echo "Unknown command $1" >&2
-    exit 1
-fi