From 260369bba4db79af6f16645ce10bbd2c6cf22b40 Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Tue, 7 Jan 2025 18:54:32 -0500
Subject: [PATCH] tidy fish

---
 fish/.config/fish/conf.d/fnm.fish |  2 --
 fish/.config/fish/config.fish     | 36 ++++---------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/fish/.config/fish/conf.d/fnm.fish b/fish/.config/fish/conf.d/fnm.fish
index 84fe182..3701000 100644
--- a/fish/.config/fish/conf.d/fnm.fish
+++ b/fish/.config/fish/conf.d/fnm.fish
@@ -1,5 +1,3 @@
-# fnm
-fish_add_path --path ~/.local/share/fnm
 if command -q fnm
     fnm env | source
 end
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 7fff748..51927f7 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -1,41 +1,13 @@
 if test -d ~/Maildir
-  set -x MAIL ~/Maildir
+    set -x MAIL ~/Maildir
 end
 
-for i in ~/bin ~/.local/bin ~/.rbenv/bin ~/.rbenv/shims ~/.cargo/bin ~/.yarn/bin ~/go/bin ~/.dotnet/tools
-  fish_add_path --path $i
+for i in ~/bin ~/.local/bin ~/.rbenv/bin ~/.rbenv/shims ~/.cargo/bin ~/.yarn/bin ~/go/bin ~/.dotnet/tools ~/.local/share/fnm
+    fish_add_path --path $i
 end
 
-# add rbenv paths
-if status --is-interactive && type -q rbenv
-  set -gx RBENV_SHELL fish
-  source '/usr/lib/rbenv/completions/rbenv.fish'
-
-  command rbenv rehash 2>/dev/null
-
-  function rbenv
-    set command $argv[1]
-    set -e argv[1]
-
-    switch "$command"
-    case rehash shell
-      source (rbenv "sh-$command" $argv|psub)
-    case '*'
-      command rbenv "$command" $argv
-    end
-  end
-end
-
-if test -S $HOME/.gnupg/S.gpg-agent
-  set -x SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent
-  set -x GPG_SOCK $HOME/.gnupg/S.gpg-agent
-else
-  type -q gpgconf && set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
-end
-
-# add dotnet completions if needed
 if status --is-interactive && type -q dotnet
-  complete -f -c dotnet -a "(dotnet complete)"
+    complete -f -c dotnet -a "(dotnet complete (commandline -cp))"
 end
 
 status --is-login && status --is-interactive && exec byobu-launcher