diff --git a/radix/home/services/shells.scm b/radix/home/services/shells.scm
index deac7e5..3311313 100644
--- a/radix/home/services/shells.scm
+++ b/radix/home/services/shells.scm
@@ -203,14 +203,14 @@ end\n\n")
              (let ((almost-basename (almost-basename file)))
                (list (string-append "fish/" almost-basename)
                      (file-append plugin
-                                  (string-append "/share/"
+                                  (string-append "/share/fish/"
                                                  almost-basename)))))
            (list-contents dir)))
 
     (let* ((drv (run-with-store (open-connection)
                   (with-store %store
                     (package->derivation plugin))))
-           (path (string-append (derivation->output-path drv) "/share")))
+           (path (string-append (derivation->output-path drv) "/share/fish/")))
       (append-map directory-files
                   (filter (negate (cut string-suffix? "doc" <>))
                           (list-contents path)))))
diff --git a/radix/packages/fish-xyz.scm b/radix/packages/fish-xyz.scm
index 8f6ab48..891c3fc 100644
--- a/radix/packages/fish-xyz.scm
+++ b/radix/packages/fish-xyz.scm
@@ -4,7 +4,6 @@
   #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix build-system copy)
-  #:use-module (guix build-system trivial)
   #:use-module ((guix licenses) #:prefix license:)
 
   #:export (fish-plugin-union))
@@ -24,8 +23,8 @@
                 "0mfx43n3ngbmyfp4a4m9a04gcgwlak6f9myx2089bhp5qkrkanmk"))))
     (build-system copy-build-system)
     (arguments
-     (list #:install-plan #~'(("conf.d" "share/")
-                              ("functions" "share/"))))
+     (list #:install-plan #~'(("conf.d" "share/fish/")
+                              ("functions" "share/fish/"))))
     (home-page "https://github.com/jorgebucaran/autopair.fish")
     (synopsis "Auto-complete matching pairs for the Fish shell.")
     (description "This package aims to provide auto-complete matching pairs
@@ -47,9 +46,9 @@ for the Fish shell.")
                 "1hqqppna8iwjnm8135qdjbd093583qd2kbq8pj507zpb1wn9ihjg"))))
     (build-system copy-build-system)
     (arguments
-     (list #:install-plan #~'(("completions" "share/")
-                              ("conf.d" "share/")
-                              ("functions" "share/"))))
+     (list #:install-plan #~'(("completions" "share/fish/")
+                              ("conf.d" "share/fish/")
+                              ("functions" "share/fish/"))))
     (home-page "https://github.com/PatrickF1/fzf.fish")
     (synopsis "Mnemonic key bindings for using fzf within the Fish shell.")
     (description "This package aims to augment your Fish shell with mnemonic
@@ -70,8 +69,8 @@ key bindings to efficiently find what you need using fzf.")
                 "1bf61f6h5p7mc0schwbd693cafp1vcjz2f7pzy6gn33nafsc5wx0"))))
     (build-system copy-build-system)
     (arguments
-      (list #:install-plan #~'(("conf.d" "share/")
-                               ("functions" "share/"))))
+      (list #:install-plan #~'(("conf.d" "share/fish/")
+                               ("functions" "share/fish/"))))
     (home-page "https://github.com/oh-my-fish/plugin-bang-bang")
     (synopsis "Bash style history substitution for the Fish shell.")
     (description "This package aims to provide Bash style history substitution
@@ -92,8 +91,8 @@ for the Fish shell.")
                 "06g8pv68b0vyhhqzj469i9rcics67cq1kbhb8946azjb8f7rhy6s"))))
     (build-system copy-build-system)
     (arguments
-      (list #:install-plan #~'(("functions" "share/")
-                               ("conf.d" "share/"))))
+      (list #:install-plan #~'(("functions" "share/fish/")
+                               ("conf.d" "share/fish/"))))
     (home-page "https://github.com/nickeb96/puffer-fish.git")
     (synopsis "Text Expansions for the Fish shell.")
     (description "This plugin aims to provide text expansions for the Fish
@@ -114,7 +113,7 @@ shell.")
                 "0vnq4kpilg0z470d7782pp8wdj57cfkfad27d6mcylwl8n7wnhrn"))))
     (build-system copy-build-system)
     (arguments
-      (list #:install-plan #~'(("functions" "share/"))))
+      (list #:install-plan #~'(("functions" "share/fish/"))))
     (home-page "https://github.com/oh-my-fish/plugin-functional")
     (synopsis "Higher order functions for the Fish shell.")
     (description "This plugin aims to provide higher order functions for the
@@ -135,7 +134,7 @@ Fish shell.")
                 "12l7m08bp8vfhl8dmi0bfpvx86i344zbg03v2bc7wfhm20li3hhc"))))
     (build-system copy-build-system)
     (arguments
-      (list #:install-plan #~'(("conf.d" "share/"))))
+      (list #:install-plan #~'(("conf.d" "share/fish/"))))
     (home-page "https://github.com/franciscolourenco/done")
     (synopsis "A fish-shell plugin to automatically receive notifications when
 long processes finish.")
@@ -157,8 +156,8 @@ when long processes finish.")
                 "0p4vk6pq858h2v39c41irrgw1fbbcs7gd9cdr9i9fd3d6i81kmri"))))
     (build-system copy-build-system)
     (arguments
-      (list #:install-plan #~'(("conf.d" "share/")
-                               ("functions" "share/"))))
+      (list #:install-plan #~'(("conf.d" "share/fish/")
+                               ("functions" "share/fish/"))))
     (home-page "https://github.com/meaningful-ooo/sponge")
     (synopsis "A fish-shell plugin to clean fish history from typos
 automatically.")