From 849cc08db49753d615b3291c2ee65d55ae5699d6 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Wed, 18 Feb 2026 13:50:18 -0800
Subject: [PATCH] merged telescope into app.nix

---
 hmModules/apps/neovim/app.nix              | 23 ++++++++----
 hmModules/apps/neovim/plugin/telescope.nix | 43 ----------------------
 2 files changed, 16 insertions(+), 50 deletions(-)
 delete mode 100644 hmModules/apps/neovim/plugin/telescope.nix

diff --git a/hmModules/apps/neovim/app.nix b/hmModules/apps/neovim/app.nix
index b996294..1fabccd 100644
--- a/hmModules/apps/neovim/app.nix
+++ b/hmModules/apps/neovim/app.nix
@@ -28,12 +28,7 @@
     };
   };
 
-  # imports = [
-  #   ./plugin/lsp.nix
-  #   ./plugin/nvimcmp.nix
-  #   ./plugin/telescope.nix
   #   ./plugin/treesitter.nix
-  # ];
 
   config = lib.mkIf config.neovim.enable {
     home.sessionVariables = {
@@ -124,8 +119,22 @@
         };
       };
 
-      telescope.enable = telescope.enable;
-      # telescope.fzf.enable = lib.mkEnableOption "Enables telescope-fzf";
+      telescope = {
+        enable = telescope.enable;
+        keymaps = [
+          { key = "<leader>ff"; action = "find_files"; }
+          { key = "<leader>fg"; action = "git_files"; }
+        ];
+        extensions = {
+          fzf = lib.mkIf telescope.fzf.enable {
+            enable = true;
+            fuzzy = true;
+            override_generic_sorter = true;
+            override_file_sorter = true;
+            case_mode = "smart_case";
+          };
+        };
+      };
 
       treesitter.enable = treesiter.enable;
 
diff --git a/hmModules/apps/neovim/plugin/telescope.nix b/hmModules/apps/neovim/plugin/telescope.nix
deleted file mode 100644
index 48a96e9..0000000
--- a/hmModules/apps/neovim/plugin/telescope.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfgp = config.neovim.plugins;
-in {
-  config = lib.mkIf (config.neovim.enable && cfgp.telescope.enable)  {
-    programs.neovim.plugins = let
-      configText = ''
-        require('telescope').setup({
-          extensions = {
-      '' + lib.strings.optionalString cfgp.telescope.fzf.enable ''
-            fzf = {
-              fuzzy = true,                    -- false will only do exact matching
-              override_generic_sorter = true,  -- override the generic sorter
-              override_file_sorter = true,     -- override the file sorter
-              case_mode = "smart_case",        -- or "ignore_case" or "respect_case"
-                                             -- the default case_mode is "smart_case"
-            }
-      '' + ''
-          }
-        })
-        local builtin = require('telescope.builtin')
-        vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-        vim.keymap.set('n', '<leader>fg', builtin.git_files, {})
-
-      '' + lib.strings.optionalString cfgp.telescope.fzf.enable ''
-        require('telescope').load_extension('fzf')
-      '';
-    in with pkgs.vimPlugins; [
-      {
-        plugin = telescope-nvim;
-        type = "lua";
-        config = configText;
-      }
-      (lib.mkIf cfgp.nvimcmp.enable telescope-fzf-native-nvim)
-    ];
-
-    home.packages = with pkgs; [
-      (lib.mkIf cfgp.telescope.fzf.enable fzf)
-    ];
-
-  };
-}