diff --git a/modules/moritz/programs/fish.nix b/modules/moritz/programs/fish.nix
index 0daef0c..7990f77 100644
--- a/modules/moritz/programs/fish.nix
+++ b/modules/moritz/programs/fish.nix
@@ -18,6 +18,7 @@ in {
   config = lib.mkIf cfg.enable {
     # set as default shell
     users.users.moritz.shell = pkgs.fish;
+    environment.systemPackages = with pkgs.fishPlugins; [fzf-fish pisces];
     # needed for nix completions
     programs.fish.enable = true;
 
@@ -25,30 +26,17 @@ in {
       programs = {
         fish = {
           enable = true;
-          plugins = let
-            mkDef = pkg: {
-              name = pkg.pname;
-              src = pkg.src;
-            };
-            plugins = with pkgs.fishPlugins; [
-              sponge
-              pisces
-              colored-man-pages
-              done
-            ];
-          in
-            map mkDef plugins
-            ++ [
-              {
-                name = "fish-completion-sync";
-                src = pkgs.fetchFromGitHub {
-                  owner = "iynaix";
-                  repo = "fish-completion-sync";
-                  rev = "4f058ad2986727a5f510e757bc82cbbfca4596f0";
-                  sha256 = "sha256-kHpdCQdYcpvi9EFM/uZXv93mZqlk1zCi2DRhWaDyK5g=";
-                };
-              }
-            ];
+          plugins = [
+            {
+              name = "fish-completion-sync";
+              src = pkgs.fetchFromGitHub {
+                owner = "pfgray";
+                repo = "fish-completion-sync";
+                rev = "ba70b6457228af520751eab48430b1b995e3e0e2";
+                sha256 = "sha256-JdOLsZZ1VFRv7zA2i/QEZ1eovOym/Wccn0SJyhiP9hI=";
+              };
+            }
+          ];
           shellAbbrs = shellConfig.abbreviations;
           shellAliases = shellConfig.aliases;
           shellInit =
diff --git a/modules/moritz/programs/nvim/plugins/tiny-inline-diagnostics.nix b/modules/moritz/programs/nvim/plugins/tiny-inline-diagnostics.nix
deleted file mode 100644
index 1e67b23..0000000
--- a/modules/moritz/programs/nvim/plugins/tiny-inline-diagnostics.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{pkgs, ...}: {
-  home-manager.users.moritz.programs.nixvim = {
-    extraPlugins = [pkgs.vimPlugins.tiny-inline-diagnostic-nvim];
-    extraConfigLuaPost = ''
-      require('tiny-inline-diagnostic').setup({
-        preset = "powerline",
-        options = {
-          throttle = 0,
-          multilines = {
-            enabled = true,
-          },
-        },
-      })
-      vim.diagnostic.config({ virtual_text = false })
-    '';
-  };
-}