From 7ff1d0143d302927803ce324c0a6b8a6d76b1e0d Mon Sep 17 00:00:00 2001
From: Florestan Bredow <daiko@daiko.fr>
Date: Tue, 14 Apr 2026 09:08:53 +0200
Subject: [PATCH] Update ssh-agent conf

---
 .config/fish/conf.d/fish-ssh-agent.fish       |  7 ------
 .config/fish/config.fish                      |  5 ++++
 .config/fish/fish_plugins                     |  2 +-
 .../functions/__ssh_agent_is_started.fish     | 23 -------------------
 .config/fish/functions/__ssh_agent_start.fish |  5 ----
 5 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100644 .config/fish/conf.d/fish-ssh-agent.fish
 delete mode 100644 .config/fish/functions/__ssh_agent_is_started.fish
 delete mode 100644 .config/fish/functions/__ssh_agent_start.fish

diff --git a/.config/fish/conf.d/fish-ssh-agent.fish b/.config/fish/conf.d/fish-ssh-agent.fish
deleted file mode 100644
index 719087a..0000000
--- a/.config/fish/conf.d/fish-ssh-agent.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-if test -z "$SSH_ENV"
-    set -xg SSH_ENV $HOME/.ssh/environment
-end
-
-if not __ssh_agent_is_started
-    __ssh_agent_start
-end
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index e69de29..a41bbc3 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -0,0 +1,5 @@
+fzf_configure_bindings
+
+if test -f "/home/brdw/.bitwarden-ssh-agent.sock"
+  set -g SSH_AUTH_SOCK "/home/brdw/.bitwarden-ssh-agent.sock"
+end
diff --git a/.config/fish/fish_plugins b/.config/fish/fish_plugins
index ccd5120..4bbe5f2 100644
--- a/.config/fish/fish_plugins
+++ b/.config/fish/fish_plugins
@@ -1,2 +1,2 @@
 jorgebucaran/fisher
-danhper/fish-ssh-agent
+patrickf1/fzf.fish
diff --git a/.config/fish/functions/__ssh_agent_is_started.fish b/.config/fish/functions/__ssh_agent_is_started.fish
deleted file mode 100644
index a9da28a..0000000
--- a/.config/fish/functions/__ssh_agent_is_started.fish
+++ /dev/null
@@ -1,23 +0,0 @@
-function __ssh_agent_is_started -d "check if ssh agent is already started"
-	if test -n "$SSH_CONNECTION"
-		# This is an SSH session
-		ssh-add -l > /dev/null 2>&1
-		if test $status -eq 0 -o $status -eq 1
-			# An SSH agent was forwarded
-			return 0
-		end
-	end
-
-	if begin; test -f "$SSH_ENV"; and test -z "$SSH_AGENT_PID"; end
-		source $SSH_ENV > /dev/null
-	end
-
-	if test -z "$SSH_AGENT_PID"
-		return 1
-	end
-
-	ssh-add -l > /dev/null 2>&1
-	if test $status -eq 2
-		return 1
-	end
-end
diff --git a/.config/fish/functions/__ssh_agent_start.fish b/.config/fish/functions/__ssh_agent_start.fish
deleted file mode 100644
index 3766fe4..0000000
--- a/.config/fish/functions/__ssh_agent_start.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-function __ssh_agent_start -d "start a new ssh agent"
-  ssh-agent -c | sed 's/^echo/#echo/' > $SSH_ENV
-  chmod 600 $SSH_ENV
-  source $SSH_ENV > /dev/null
-end