diff options
| -rw-r--r-- | config/fish/config.fish | 2 | ||||
| -rwxr-xr-x | setup.py | 10 | ||||
| -rw-r--r-- | ssh/ssh-agent.service | 11 |
3 files changed, 9 insertions, 14 deletions
diff --git a/config/fish/config.fish b/config/fish/config.fish index 0cd3ddc..d769652 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -79,7 +79,7 @@ end not set -q VISUAL; and set -q EDITOR; set -x VISUAL $EDITOR not set -q SSH_KEY_PATH; and set -x SSH_KEY_PATH $HOME/.ssh/id_rsa -not set -q SSH_AUTH_SOCK; set -x SSH_AUTH_SOCK $HOME/.ssh/agent.sock +not set -q SSH_AUTH_SOCK; set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket set -x GPG_TTY (tty) @@ -43,6 +43,13 @@ def fish_config(quiet): subprocess.run(["fish", dir_path + "fisher.fish"]) +def enable_ssh_agent(quiet): + """enable the systemd ssh-agent unit for the user session""" + if not quiet: + print("Enabling ssh-agent user unit") + subprocess.run("systemctl --user enable ssh-agent.service", check=True) + + def vdirsyncer_init(quiet): """discover and sync""" if not quiet: @@ -129,8 +136,7 @@ targets = { [("bin/alert", local_bin_dir + "/alert"), ("bin/set_theme", local_bin_dir + "/set_theme")], "ssh": - [("ssh/config.gpg", home_dir + "/.ssh/config"), - ("ssh/ssh-agent.service", config_dir + "/systemd/user/ssh-agent.service")], + [("ssh/config.gpg", home_dir + "/.ssh/config"), enable_ssh_agent], "sway": [dotfile_loc_helper], "terminator": diff --git a/ssh/ssh-agent.service b/ssh/ssh-agent.service deleted file mode 100644 index 09144f2..0000000 --- a/ssh/ssh-agent.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=SSH key agent - -[Service] -Type=simple -Environment=SSH_AUTH_SOCK=%h/.ssh/agent.sock -ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK - -[Install] -WantedBy=default.target - |