From 5fbc081c4645325ab1ab1e7ab054f535fed41977 Mon Sep 17 00:00:00 2001
From: Zhongheng Liu <z.liu@outlook.com.gr>
Date: Sun, 11 Aug 2024 20:27:55 +0800
Subject: [PATCH] feat: add zoxide integration with fish

---
 home-manager/stvnliu/shells/default.nix |  1 +
 home-manager/stvnliu/shells/fish.nix    |  3 ---
 home-manager/stvnliu/shells/zoxide.nix  | 12 ++++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 home-manager/stvnliu/shells/zoxide.nix

diff --git a/home-manager/stvnliu/shells/default.nix b/home-manager/stvnliu/shells/default.nix
index 54807d3..11db1e7 100644
--- a/home-manager/stvnliu/shells/default.nix
+++ b/home-manager/stvnliu/shells/default.nix
@@ -10,6 +10,7 @@ in
     imports = [
       ./zsh.nix
       ./fish.nix
+      ./zoxide.nix
       ./direnv.nix
       ./starship
     ];
diff --git a/home-manager/stvnliu/shells/fish.nix b/home-manager/stvnliu/shells/fish.nix
index 2c6d444..a127746 100644
--- a/home-manager/stvnliu/shells/fish.nix
+++ b/home-manager/stvnliu/shells/fish.nix
@@ -14,9 +14,6 @@ in
       programs.fish = {
         enable = true;
         shellAliases = import ./aliases {inherit pkgs;};
-        interactiveShellInit = ''
-          ${pkgs.zoxide}/bin/zoxide init fish | source
-        '';
         plugins = [
           {
             name = "z";
diff --git a/home-manager/stvnliu/shells/zoxide.nix b/home-manager/stvnliu/shells/zoxide.nix
new file mode 100644
index 0000000..9f33410
--- /dev/null
+++ b/home-manager/stvnliu/shells/zoxide.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = config.myShells.zsh.enable;
+    enableFishIntegration = config.myShells.fish.enable;
+  };
+}