diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 9b917d5e..0f6e2f31 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -289,7 +289,6 @@ [BANanaD3V](https://github.com/BANanaD3V): - `alpha` is now configured with nix. -- Add `markview-nvim` markdown renderer. [viicslen](https://github.com/viicslen): @@ -339,13 +338,11 @@ [flash.nvim]: https://github.com/folke/flash.nvim [gitlinker.nvim]: https://github.com/linrongbin16/gitlinker.nvim -[nvim-treesitter-textobjects]: https://github.com/nvim-treesitter/nvim-treesitter-textobjects - Fix oil config referencing snacks - Add [flash.nvim] plugin to `vim.utility.motion.flash-nvim` - Fix default telescope ignore list entry for '.git/' to properly match - Add [gitlinker.nvim] plugin to `vim.git.gitlinker-nvim` -- Add [nvim-treesitter-textobjects] plugin to `vim.treesitter.textobjects` [rrvsh](https://github.com/rrvsh): diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix index 23848835..eeb80e8d 100644 --- a/modules/plugins/languages/markdown.nix +++ b/modules/plugins/languages/markdown.nix @@ -130,18 +130,6 @@ in { }; }; }; - markview-nvim = { - enable = - mkEnableOption "" - // { - description = '' - [markview.nvim]: https://github.com/OXY2DEV/markview.nvim - - [markview.nvim] - a hackable markdown, Typst, latex, html(inline) & YAML previewer - ''; - }; - setupOpts = mkPluginSetupOption "markview-nvim" {}; - }; }; extraDiagnostics = { @@ -187,13 +175,6 @@ in { ''; }) - (mkIf cfg.extensions.markview-nvim.enable { - vim.startPlugins = ["markview-nvim"]; - vim.pluginRC.markview-nvim = entryAnywhere '' - require("markview").setup(${toLuaObject cfg.extensions.markview-nvim.setupOpts}) - ''; - }) - (mkIf cfg.extraDiagnostics.enable { vim.diagnostics.nvim-lint = { enable = true; diff --git a/modules/plugins/treesitter/default.nix b/modules/plugins/treesitter/default.nix index ea8ac9cd..a859f3af 100644 --- a/modules/plugins/treesitter/default.nix +++ b/modules/plugins/treesitter/default.nix @@ -2,7 +2,6 @@ imports = [ # treesitter extras ./ts-context - ./ts-textobjects ./treesitter.nix ./config.nix diff --git a/modules/plugins/treesitter/ts-textobjects/config.nix b/modules/plugins/treesitter/ts-textobjects/config.nix deleted file mode 100644 index 7a9239d1..00000000 --- a/modules/plugins/treesitter/ts-textobjects/config.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.modules) mkIf; - inherit (lib.nvim.lua) toLuaObject; - inherit (lib.nvim.dag) entryAfter; - - inherit (config.vim) treesitter; - cfg = treesitter.textobjects; -in { - config = mkIf (treesitter.enable && cfg.enable) { - vim = { - startPlugins = ["nvim-treesitter-textobjects"]; - - # set up treesitter-textobjects after Treesitter, whose config we're adding to. - pluginRC.treesitter-textobjects = entryAfter ["treesitter"] '' - require("nvim-treesitter.configs").setup({textobjects = ${toLuaObject cfg.setupOpts}}) - ''; - }; - }; -} diff --git a/modules/plugins/treesitter/ts-textobjects/default.nix b/modules/plugins/treesitter/ts-textobjects/default.nix deleted file mode 100644 index d0ae48a3..00000000 --- a/modules/plugins/treesitter/ts-textobjects/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./textobjects.nix - ./config.nix - ]; -} diff --git a/modules/plugins/treesitter/ts-textobjects/textobjects.nix b/modules/plugins/treesitter/ts-textobjects/textobjects.nix deleted file mode 100644 index 07e72135..00000000 --- a/modules/plugins/treesitter/ts-textobjects/textobjects.nix +++ /dev/null @@ -1,21 +0,0 @@ -{lib, ...}: let - inherit (lib.options) mkEnableOption; - inherit (lib.nvim.types) mkPluginSetupOption; -in { - options.vim.treesitter.textobjects = { - enable = mkEnableOption "Treesitter textobjects"; - setupOpts = - mkPluginSetupOption "treesitter-textobjects" {} - // { - example = { - select = { - enable = true; - lookahead = true; - keymaps = { - af = "@function.outer"; - }; - }; - }; - }; - }; -} diff --git a/npins/sources.json b/npins/sources.json index d4c0aa14..8e82850a 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -861,18 +861,6 @@ "url": "https://github.com/horriblename/lzn-auto-require/archive/ef746afb55467984ef3200d9709c8059ee0257d0.tar.gz", "hash": "1mgka1mmvpd2gfya898qdbbwrp5rpqds8manjs1s7g5x63xp6b98" }, - "markview-nvim": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "OXY2DEV", - "repo": "markview.nvim" - }, - "branch": "main", - "revision": "6c92a6455e97c954a4a419265a032fedd69846f6", - "url": "https://github.com/OXY2DEV/markview.nvim/archive/6c92a6455e97c954a4a419265a032fedd69846f6.tar.gz", - "hash": "01sw4iscnciyifpba4cwjb6fs95wrkk60xvqq67b8d5j8yb5449a" - }, "mind-nvim": { "type": "Git", "repository": { @@ -1906,19 +1894,6 @@ "url": "https://github.com/nvim-treesitter/nvim-treesitter-context/archive/6daca3ad780f045550b820f262002f35175a6c04.tar.gz", "hash": "0qprwd44hw9sz0vh14p6lpvs9vxrick462pfkradmal6ak1kfwn3" }, - "nvim-treesitter-textobjects": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-textobjects" - }, - "branch": "master", - "submodules": false, - "revision": "0e3be38005e9673d044e994b1e4b123adb040179", - "url": "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/archive/0e3be38005e9673d044e994b1e4b123adb040179.tar.gz", - "hash": "0y93pj3asarw7jhk4cdphhx6awxdyiwajc0n9nr4836gn48qcs85" - }, "nvim-ts-autotag": { "type": "Git", "repository": {