diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 368df9f5..a3387fd6 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -301,9 +301,6 @@ - Update default `telescope.setupOpts.pickers.find_files.find_command` to only include files (and therefore exclude directories from results) -[ckoehler](https://github.com/ckoehler): + [ckoehler](https://github.com/ckoehler): -[flash.nvim]: https://github.com/folke/flash.nvim - -- Fix oil config referencing snacks -- Add [flash.nvim] plugin to `vim.utility.motion.flash-nvim` + - Fix oil config referencing snacks diff --git a/modules/plugins/utility/motion/default.nix b/modules/plugins/utility/motion/default.nix index 10074939..838fec78 100644 --- a/modules/plugins/utility/motion/default.nix +++ b/modules/plugins/utility/motion/default.nix @@ -1,6 +1,5 @@ _: { imports = [ - ./flash ./hop ./leap ./precognition diff --git a/modules/plugins/utility/motion/flash/config.nix b/modules/plugins/utility/motion/flash/config.nix deleted file mode 100644 index 3adf0de8..00000000 --- a/modules/plugins/utility/motion/flash/config.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.modules) mkIf; - inherit (lib.nvim.binds) mkKeymap; - inherit (lib.nvim.lua) toLuaObject; - inherit (lib.nvim.dag) entryAnywhere; - - cfg = config.vim.utility.motion.flash-nvim; -in { - config = mkIf cfg.enable { - vim = { - lazy.plugins = { - "flash-nvim" = { - package = "flash-nvim"; - setupModule = "flash"; - setupOpts = cfg.setupOpts; - - lazy = true; - - keys = [ - (mkKeymap ["n" "o" "x"] cfg.mappings.jump "lua require(\"flash\").jump()" {desc = "Flash";}) - (mkKeymap ["n" "o" "x"] cfg.mappings.treesitter "lua require(\"flash\").treesitter()" {desc = "Flash Treesitter";}) - (mkKeymap "o" cfg.mappings.remote "lua require(\"flash\").remote()" {desc = "Remote Flash";}) - (mkKeymap ["o" "x"] cfg.mappings.treesitter_search "lua require(\"flash\").treesitter_search()" {desc = "Treesitter Search";}) - (mkKeymap "c" cfg.mappings.toggle "lua require(\"flash\").toggle()" {desc = "Toggle Flash Search";}) - ]; - }; - }; - }; - }; -} diff --git a/modules/plugins/utility/motion/flash/default.nix b/modules/plugins/utility/motion/flash/default.nix deleted file mode 100644 index 5978df25..00000000 --- a/modules/plugins/utility/motion/flash/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./flash.nix - ./config.nix - ]; -} diff --git a/modules/plugins/utility/motion/flash/flash.nix b/modules/plugins/utility/motion/flash/flash.nix deleted file mode 100644 index 825b86a0..00000000 --- a/modules/plugins/utility/motion/flash/flash.nix +++ /dev/null @@ -1,38 +0,0 @@ -{lib, ...}: let - inherit (lib.options) mkEnableOption mkOption; - inherit (lib.types) nullOr str; - inherit (lib.nvim.types) mkPluginSetupOption; -in { - options.vim.utility.motion.flash-nvim = { - enable = mkEnableOption "enhanced code navigation with flash.nvim"; - setupOpts = mkPluginSetupOption "flash-nvim" {}; - - mappings = { - jump = mkOption { - type = nullOr str; - default = "s"; - description = "Jump"; - }; - treesitter = mkOption { - type = nullOr str; - default = "S"; - description = "Treesitter"; - }; - remote = mkOption { - type = nullOr str; - default = "r"; - description = "Remote Flash"; - }; - treesitter_search = mkOption { - type = nullOr str; - default = "R"; - description = "Treesitter Search"; - }; - toggle = mkOption { - type = nullOr str; - default = ""; - description = "Toggle Flash Search"; - }; - }; - }; -} diff --git a/npins/sources.json b/npins/sources.json index a8573213..74dc20c8 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -471,19 +471,6 @@ "url": "https://github.com/j-hui/fidget.nvim/archive/d9ba6b7bfe29b3119a610892af67602641da778e.tar.gz", "hash": "070jadci8x6zgxnsqaldjah1gm1p78wscsb9wpn5wn8mjkyk2m80" }, - "flash-nvim": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "folke", - "repo": "flash.nvim" - }, - "branch": "main", - "submodules": false, - "revision": "3c942666f115e2811e959eabbdd361a025db8b63", - "url": "https://github.com/folke/flash.nvim/archive/3c942666f115e2811e959eabbdd361a025db8b63.tar.gz", - "hash": "1xil2lkyr404zni1qmkwrl9hvbwjjk52fmncg59vqmvdybwsnqni" - }, "flutter-tools-nvim": { "type": "Git", "repository": {