commit 55441f730cfe8fd6ce5b8bded27b4675dc8e0642
parent 0c9c656c8bc8463b459568a17d9b5a98846980c4
Author: Tomas Nemec <owl@gtms.dev>
Date: Fri, 22 Nov 2024 10:05:52 +0100
update
Diffstat:
9 files changed, 84 insertions(+), 16 deletions(-)
diff --git a/after/plugin/mini-ai.lua b/after/plugin/mini-ai.lua
@@ -0,0 +1,16 @@
+if not pcall(require, 'mini.ai') then return end
+
+local gen_spec = require 'mini.ai'.gen_spec
+require 'mini.ai'.setup {
+ custom_textobjects = {
+ F = gen_spec.treesitter {
+ a = '@function.outer',
+ i = '@function.inner'
+ },
+ o = gen_spec.treesitter {
+ a = { '@conditional.outer', '@loop.outer' },
+ i = { '@conditional.inner', '@loop.inner' },
+ }
+ },
+ silent = true,
+}
diff --git a/after/plugin/mini-animate.lua b/after/plugin/mini-animate.lua
@@ -0,0 +1,12 @@
+if not pcall(require, 'mini.animate') then return end
+
+local animate = require 'mini.animate'
+animate.setup {
+ scroll = {
+ timing = animate.gen_timing.linear({ duration = 80, unit = 'total' }),
+ },
+ cursor = { enable = false },
+ resize = { enable = false },
+ open = { enable = false },
+ close = { enable = false },
+}
diff --git a/after/plugin/mini-operators.lua b/after/plugin/mini-operators.lua
@@ -0,0 +1,3 @@
+if not pcall(require, 'mini.operators') then return end
+
+require 'mini.operators'.setup()
diff --git a/after/plugin/mini-surround.lua b/after/plugin/mini-surround.lua
@@ -0,0 +1,12 @@
+if not pcall(require, 'mini.surround') then return end
+
+local ts_input = require 'mini.surround'.gen_spec.input.treesitter
+require 'mini.surround'.setup {
+ custom_surroundings = {
+ -- Use tree-sitter to search for function call
+ -- f = {
+ -- input = ts_input { outer = '@call.outer', inner = '@call.inner' }
+ -- },
+ },
+ mappings = { suffix_last = "p" }
+}
diff --git a/after/plugin/nvim-surround.lua b/after/plugin/nvim-surround.lua
@@ -1,8 +0,0 @@
-if not pcall(require, 'nvim-surround') then return end
-
-require 'nvim-surround'.setup()
-
-vim.keymap.set('o', 'ir', 'i[')
-vim.keymap.set('o', 'ar', 'a[')
-vim.keymap.set('o', 'ia', 'i<')
-vim.keymap.set('o', 'aa', 'a<')
diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua
@@ -40,7 +40,7 @@ require 'nvim-treesitter.configs'.setup {
textobjects = {
enable = true,
select = {
- enable = true,
+ enable = false,
keymaps = {
['ia'] = '@parameter.inner',
['aa'] = '@parameter.outer',
@@ -51,7 +51,7 @@ require 'nvim-treesitter.configs'.setup {
},
},
swap = {
- enable = true,
+ enable = false,
swap_next = {
--
['>p'] = '@parameter.inner',
diff --git a/after/queries/bash/injections.scm b/after/queries/bash/injections.scm
@@ -0,0 +1,8 @@
+;; extends
+
+(command
+ name: (command_name (word)) @name (#eq? @name "curl")
+ argument: (word) @arg (#eq? @arg "--data")
+ argument: (raw_string) @injection.content
+ (#lua-match? @injection.content "^'%{.*%}'")
+ (#set! injection.language "json"))
diff --git a/after/queries/xml/injections.scm b/after/queries/xml/injections.scm
@@ -0,0 +1,6 @@
+;; extends
+
+(CDSect
+ (CDStart)
+ (CData) @injection.content
+ (#set! injection.language "groovy"))
diff --git a/lua/plugins.lua b/lua/plugins.lua
@@ -3,16 +3,23 @@ return require('paq') {
{ 'savq/paq-nvim', opt = true },
'kyazdani42/nvim-web-devicons',
'nvim-lua/plenary.nvim',
- 'nvim-lua/popup.nvim',
'yioneko/nvim-type-fmt',
'tweekmonster/startuptime.vim',
'xxdavid/bez-diakritiky.vim',
+
+ -- leap
'ggandor/leap.nvim',
'ggandor/leap-spooky.nvim',
'ggandor/flit.nvim',
'rasulomaroff/telepath.nvim',
+
+ -- mini
+ 'echasnovski/mini.surround',
+ 'echasnovski/mini.ai',
+ 'echasnovski/mini.operators',
+ 'echasnovski/mini.animate',
+
'tpope/vim-repeat',
- 'kylechui/nvim-surround',
'chaoren/vim-wordmotion',
'romgrk/equal.operator',
{ 'godlygeek/tabular', opt = true },
@@ -20,7 +27,6 @@ return require('paq') {
'mbbill/undotree',
'nvchad/nvim-colorizer.lua',
'rainbowhxch/beacon.nvim',
- 'karb94/neoscroll.nvim',
'elihunter173/dirbuf.nvim',
'j-hui/fidget.nvim',
{ 'lervag/vimtex', opt = true },
@@ -31,7 +37,6 @@ return require('paq') {
'stevearc/quicker.nvim',
'shortcuts/no-neck-pain.nvim',
'nagy135/typebreak.nvim',
- -- 'm4xshen/hardtime.nvim',
{ 'lewis6991/gitsigns.nvim', requires = { 'nvim-lua/plenary.nvim' } },
'sindrets/diffview.nvim',
'tpope/vim-fugitive',
@@ -42,6 +47,7 @@ return require('paq') {
'windwp/nvim-ts-autotag',
'baskerville/vim-sxhkdrc',
'mfussenegger/nvim-jdtls',
+
-- cmp
'tzachar/cmp-ai',
'dmitmel/cmp-cmdline-history',
@@ -59,18 +65,22 @@ return require('paq') {
'tamago324/cmp-zsh',
'uga-rosa/cmp-dictionary',
'hrsh7th/nvim-cmp',
+
-- get rid of this
'stevearc/dressing.nvim',
'rcarriga/nvim-notify',
+
+ -- lsp
'neovim/nvim-lspconfig',
'williamboman/mason.nvim',
'williamboman/mason-lspconfig.nvim',
'b0o/schemastore.nvim',
-- can we get rid of this?
'folke/lazydev.nvim',
- -- { 'jose-elias-alvarez/null-ls.nvim', requires = { 'nvim-lua/plenary.nvim' } },
'stevearc/conform.nvim',
'monkoose/neocodeium',
+
+ -- dap
'mfussenegger/nvim-dap',
'leoluz/nvim-dap-go',
'nvim-neotest/nvim-nio',
@@ -82,20 +92,26 @@ return require('paq') {
opt = true,
build = 'npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out',
},
+
+ -- treesitter
'nvim-treesitter/nvim-treesitter',
'nvim-treesitter/nvim-treesitter-textobjects',
'nvim-treesitter/nvim-treesitter-refactor',
-- 'nvim-treesitter/nvim-treesitter-context',
'nvim-treesitter/playground',
'JoosepAlviste/nvim-ts-context-commentstring',
+
'cshuaimin/ssr.nvim',
'ThePrimeagen/refactoring.nvim',
+
+ -- telescope
{
'nvim-telescope/telescope.nvim',
requires = { 'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim', 'kyazdani42/nvim-web-devicons' },
},
'nvim-telescope/telescope-fzy-native.nvim',
'nvim-telescope/telescope-dap.nvim',
+
{ 'aaronhallaert/advanced-git-search.nvim', requires = { 'tpope/vim-fugitive' } },
'habamax/vim-godot',
'codethread/qmk.nvim',
@@ -104,8 +120,11 @@ return require('paq') {
{ url = 'git@gitlab.com:gtms/dart-tools.nvim' },
-- use '/home/tms/dev/nvim/plugins/dart-tools.nvim'
{ url = 'git@gitlab.com:gtms/difftastic.nvim' },
+
+ -- dadbot
'tpope/vim-dadbod',
'kristijanhusak/vim-dadbod-ui',
'kristijanhusak/vim-dadbod-completion',
- 'michaelrommel/nvim-silicon',
+
+ 'michaelrommel/nvim-silicon', -- code image
}
