diff --git a/common/home-manager/nixvim/default.nix b/common/home-manager/nixvim/default.nix
index 7509317..e63cede 100644
--- a/common/home-manager/nixvim/default.nix
+++ b/common/home-manager/nixvim/default.nix
@@ -1,13 +1,12 @@
-{ pkgs, ... }: {
+{ ... }: {
   imports = [
     ./completion.nix
+    ./fzf-lua.nix
     ./lsp.nix
     ./lualine.nix
     ./neo-tree.nix
     ./none-ls.nix
     ./treesitter.nix
-    ./telescope.nix
-    ./trouble.nix
   ];
   programs.nixvim = {
     enable = true;
@@ -43,7 +42,5 @@
       web-devicons.enable = true;
       nvim-autopairs.enable = true;
     };
-
-    extraPlugins = with pkgs.vimPlugins; [ nvim-web-devicons ];
   };
 }
diff --git a/common/home-manager/nixvim/fzf-lua.nix b/common/home-manager/nixvim/fzf-lua.nix
new file mode 100644
index 0000000..699c1c3
--- /dev/null
+++ b/common/home-manager/nixvim/fzf-lua.nix
@@ -0,0 +1,19 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [ ripgrep ];
+  programs.nixvim.plugins.fzf-lua = {
+    enable = true;
+    keymaps = {
+      "<leader>ff" = "files";
+      "<leader>fg" = "live_grep";
+      "<leader>bb" = "buffers";
+      "<leader>dg" = {
+        action = "diagnostics_document";
+        settings = {
+          previewer = "none";
+          diag_icons = ''{"","","",""}'';
+          multiline = 1;
+        };
+      };
+    };
+  };
+}
diff --git a/common/home-manager/nixvim/telescope.nix b/common/home-manager/nixvim/telescope.nix
deleted file mode 100644
index 953feaa..0000000
--- a/common/home-manager/nixvim/telescope.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ ripgrep ];
-  programs.nixvim.plugins.telescope = {
-    enable = true;
-    keymaps = {
-      "<leader>ff" = "find_files";
-      "<leader>fg" = "live_grep";
-      "<leader>bb" = "buffers";
-    };
-  };
-}
diff --git a/common/home-manager/nixvim/trouble.nix b/common/home-manager/nixvim/trouble.nix
deleted file mode 100644
index b2d5763..0000000
--- a/common/home-manager/nixvim/trouble.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ ... }: {
-  programs.nixvim = {
-    plugins.trouble = {
-      enable = true;
-      settings = {
-        auto_refresh = true;
-        focus = true;
-        follow = false;
-        keys = {
-          "<cr>" = "jump_close";
-          "s" = "jump_vsplit";
-          "S" = "jump_split";
-        };
-        win = {
-          type = "float";
-          border = "rounded";
-        };
-      };
-    };
-    keymaps = [
-      {
-        action = "<cmd>Trouble diagnostics toggle<cr>";
-        key = "<leader>dg";
-      }
-      {
-        action = "<cmd>Trouble symbols toggle auto_close=true focus=true<cr>";
-        key = "<leader>sy";
-      }
-    ];
-  };
-}