diff --git a/config/plugins/default.nix b/config/plugins/default.nix
index e5759f6..be3d86f 100644
--- a/config/plugins/default.nix
+++ b/config/plugins/default.nix
@@ -5,10 +5,10 @@
     ./cmp.nix
     ./comment.nix
     ./cursorline.nix
+    ./fzf-lua.nix
     ./gitsigns.nix
     ./lsp.nix
     ./lualine.nix
-    ./telescope.nix
     ./which-key.nix
   ];
 
diff --git a/config/plugins/fzf-lua.nix b/config/plugins/fzf-lua.nix
index f9362ac..2bc7eb0 100644
--- a/config/plugins/fzf-lua.nix
+++ b/config/plugins/fzf-lua.nix
@@ -1,4 +1,17 @@
-{ ... }:
+{
+  ...
+}:
+let
+  mkMap =
+    action: desc:
+    {
+      inherit action;
+      options = {
+        silent = true;
+        inherit desc;
+      };
+    };
+in
 {
   plugins.fzf-lua = {
     enable = true;
@@ -8,49 +21,47 @@
         height = 0.85;
         width = 0.9;
       };
-      fzf_opts = {
-        "--layout" = "reverse";
-      };
+      # fzf_opts = {
+        # "--layout" = "reverse";
+      # };
       git_icons = true;
-      defaults = {
-        file_icons = true;
-      };
+      defaults.file_icons = true;
     };
 
     keymaps = {
       # Files and search
-      "<Space>f" = "files";
-      "<Space>F" = "oldfiles";
-      "<Space>g" = "live_grep";
+      "<Space>f" = mkMap "files" "Fzf-Lua Files";
+      "<Space>F" = mkMap "oldfiles" "Fzf-Lua Old Files";
+      "<Space>g" = mkMap "live_grep" "Fzf-Lua Live Grep";
 
       # Buffers and windows
-      "<Space>b" = "buffers";
-      "<Space>w" = "tabs";
+      "<Space>b" = mkMap "buffers" "Fzf-Lua Buffers";
+      "<Space>w" = mkMap "tabs" "Fzf-Lua Tabs";
 
       # Discoverability
-      "<Space>h" = "help";
-      "<Space>m" = "keymaps";
-      "<Space>c" = "colorschemes";
+      "<Space>m" = mkMap "keymaps" "Fzf-Lua Keymaps";
+      "<Space>c" = mkMap "colorschemes" "Fzf-Lua Colorschemes";
 
       # Git
-      "<Space>gs" = "git_status";
-      "<Space>gf" = "git_files";
-      "<Space>gl" = "git_log";
-      "<Space>gc" = "git_commits";
-      "<Space>gb" = "git_bcommits";
+      "<Space>gs" = mkMap "git_status" "Fzf-Lua Git Status";
+      "<Space>gf" = mkMap "git_files" "Fzf-Lua Git Files";
+      "<Space>gl" = mkMap "git_log" "Fzf-Lua Git Log";
+      "<Space>gc" = mkMap "git_commits" "Fzf-Lua Git Commits";
+      "<Space>gb" = mkMap "git_bcommits" "Fzf-Lua Git Buffer Commits";
 
       # LSP
-      "<Space>l" = "lsp_document_symbols";
-      "<Space>lr" = "lsp_references";
-      "<Space>ld" = "lsp_definitions";
-      "<Space>la" = "lsp_code_actions";
-      "<Space>lw" = "lsp_workspace_symbols";
+      "<Space>l" = mkMap "lsp_document_symbols" "Fzf-Lua Document Symbols";
+      "<Space>lr" = mkMap "lsp_references" "Fzf-Lua References";
+      "<Space>ld" = mkMap "lsp_definitions" "Fzf-Lua Definitions";
+      "<Space>la" = mkMap "lsp_code_actions" "Fzf-Lua Code Actions";
+      "<Space>lw" = mkMap "lsp_workspace_symbols" "Fzf-Lua Workspace Symbols";
 
       # Diagnostics
-      "<Space>x" = "diagnostics";
+      "<Space>x" = mkMap "diagnostics_document" "Fzf-Lua Diagnostics";
+      "<Space>X" = mkMap "diagnostics_workspace" "Fzf-Lua Diagnostics Workspace";
 
-      # Resume last picker
-      "<Space>z" = "resume";
+      # Resume
+      "<Space>z" = mkMap "resume" "Fzf-Lua Resume";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/config/plugins/telescope.nix b/config/plugins/telescope.nix
deleted file mode 100644
index 0ef8395..0000000
--- a/config/plugins/telescope.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }:
-{
-  plugins.telescope = {
-    enable = true;
-    keymaps = {
-      "<Space>f" = "find_files";
-      "<Space>g" = "live_grep";
-    };
-  };
-}
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index 58c9388..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs }:
-
-pkgs.mkShell {
-  buildInputs = with pkgs; [
-    ripgrep
-    git
-  ];
-}