refactor(ssh): unify SSH agent approach (use 'KeePassXC')
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
# shellcheck disable=SC1090
|
||||
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
||||
|
||||
export SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/ssh-agent.socket"
|
||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||
|
||||
if [[ -z "${DISPLAY}" ]] && [[ "${XDG_VTNR}" -eq 1 ]]; then
|
||||
|
||||
@@ -97,12 +97,6 @@ export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab
|
||||
# Zettelkasten {{{
|
||||
export ZK_PATH="$HOME/.zk"
|
||||
|
||||
# SSH Agent {{{
|
||||
if [[ -z "${SSH_CONNECTION}" ]]; then
|
||||
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
|
||||
fi
|
||||
# }}}
|
||||
|
||||
|
||||
# Codi
|
||||
# Usage: codi [filetype] [filename]
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
[Unit]
|
||||
Description=SSH Key agent
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
|
||||
ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
@@ -15,6 +15,7 @@ in
|
||||
enable = true;
|
||||
settings = {
|
||||
Browser.Enabled = true;
|
||||
SSHAgent.Enabled = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -14,6 +14,13 @@ in
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = with pkgs; [ sshfs ];
|
||||
|
||||
services.ssh-agent.enable = true;
|
||||
|
||||
systemd.user.services.ssh-agent.Service.Environment = [
|
||||
"SSH_ASKPASS=${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass"
|
||||
"SSH_ASKPASS_REQUIRE=prefer"
|
||||
];
|
||||
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
|
||||
Reference in New Issue
Block a user