Merge 941a2a6f2e into 67abc51902

docs/release-notes/rl-0.7.md

@@ -176,9 +176,3 @@ vim.maps."<leader>m" = {
   - `nvf-print-config-path` will display the path to _a clone_ of your
     `init.lua`. This is not the path used by the Neovim wrapper, but an
     identical clone.
-
-[ppenguin](https://github.com/ppenguin):
-
-- Telescope:
-  - Fixed `project-nvim` command and keybinding
-  - Added default ikeybind/command for `Telescope resume` (`<leader>fr`)

flake.lock

@@ -69,11 +69,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1726188505,
-        "narHash": "sha256-3dkxJo6y/aKfwkAg6YnpdiQAoZKgHhWHz7ilGJHCoVU=",
+        "lastModified": 1724456641,
+        "narHash": "sha256-SMgnviF6ofBPbyV3+rljPGcX0Hn9HBOhgXE10Cyjaic=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "ea00b3d2162d85dd085a6ba6d49aa2a186e588e7",
+        "rev": "c261925dbbf02f523af0e8add844df64fddf0359",
         "type": "github"
       },
       "original": {
@@ -129,11 +129,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726142289,
-        "narHash": "sha256-Jks8O42La+nm5AMTSq/PvM5O+fUAhIy0Ce1QYqLkyZ4=",
+        "lastModified": 1724395761,
+        "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "280db3decab4cbeb22a4599bd472229ab74d25e1",
+        "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
         "type": "github"
       },
       "original": {

modules/plugins/utility/telescope/config.nix

@@ -17,19 +17,17 @@
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
-    vim = {
-      startPlugins = [
+    vim.startPlugins = [
       "telescope"
       "plenary-nvim"
     ];
 
-      maps.normal = mkMerge [
+    vim.maps.normal = mkMerge [
       (mkSetBinding mappings.findFiles "<cmd> Telescope find_files<CR>")
       (mkSetBinding mappings.liveGrep "<cmd> Telescope live_grep<CR>")
       (mkSetBinding mappings.buffers "<cmd> Telescope buffers<CR>")
       (mkSetBinding mappings.helpTags "<cmd> Telescope help_tags<CR>")
       (mkSetBinding mappings.open "<cmd> Telescope<CR>")
-        (mkSetBinding mappings.resume "<cmd> Telescope resume<CR>")
 
       (mkSetBinding mappings.gitCommits "<cmd> Telescope git_commits<CR>")
       (mkSetBinding mappings.gitBufferCommits "<cmd> Telescope git_bcommits<CR>")
@@ -55,11 +53,11 @@ in {
 
       (
         mkIf config.vim.projects.project-nvim.enable
-          (mkSetBinding mappings.findProjects "<cmd> Telescope projects<CR>")
+        (mkSetBinding mappings.findProjects "<cmd Telescope projects<CR>")
       )
     ];
 
-      binds.whichKey.register = pushDownDefault {
+    vim.binds.whichKey.register = pushDownDefault {
       "<leader>f" = "+Telescope";
       "<leader>fl" = "Telescope LSP";
       "<leader>fm" = "Cellular Automaton";
@@ -67,7 +65,7 @@ in {
       "<leader>fvc" = "Commits";
     };
 
-      pluginRC.telescope = entryAnywhere ''
+    vim.pluginRC.telescope = entryAnywhere ''
       local telescope = require('telescope')
       telescope.setup(${toLuaObject cfg.setupOpts})
 
@@ -90,5 +88,4 @@ in {
       }
     '';
   };
-  };
 }

modules/plugins/utility/telescope/telescope.nix

@@ -150,13 +150,13 @@
 in {
   options.vim.telescope = {
     mappings = {
-      findProjects = mkMappingOption "Find projects [Telescope]" "<leader>fp";
+      findProjects = mkMappingOption "Find files [Telescope]" "<leader>fp";
+
       findFiles = mkMappingOption "Find files [Telescope]" "<leader>ff";
       liveGrep = mkMappingOption "Live grep [Telescope]" "<leader>fg";
       buffers = mkMappingOption "Buffers [Telescope]" "<leader>fb";
       helpTags = mkMappingOption "Help tags [Telescope]" "<leader>fh";
       open = mkMappingOption "Open [Telescope]" "<leader>ft";
-      resume = mkMappingOption "Resume (previous search) [Telescope]" "<leader>fr";
 
       gitCommits = mkMappingOption "Git commits [Telescope]" "<leader>fvcw";
       gitBufferCommits = mkMappingOption "Git buffer commits [Telescope]" "<leader>fvcb";