Compare commits

..

No commits in common. "9f4b7f8e9f53ddc7d2909ecd40d92bb51e9e9dca" and "d8949f0cee4cb69f8216d838d2459978ad5d2edc" have entirely different histories.

4 changed files with 82 additions and 178 deletions

View file

@ -55,39 +55,6 @@ with final.pkgs.lib; let
flash-nvim flash-nvim
which-key-nvim which-key-nvim
gitsigns-nvim gitsigns-nvim
# Treesitter
(nvim-treesitter.withPlugins (
plugins:
with plugins; [
bash
diff
html
gitignore
javascript
jsdoc
json
jsonc
just
lua
luadoc
markdown
markdown_inline
nix
just
printf
python
query
regex
toml
tsx
typescript
vim
vimdoc
xml
yaml
]
))
]; ];
extraPackages = with pkgs; [ extraPackages = with pkgs; [

View file

@ -27,8 +27,6 @@ return {
local icons = require('icons') local icons = require('icons')
local mkKey = MarleyVim.wkSpec(require('colors').git) local mkKey = MarleyVim.wkSpec(require('colors').git)
require('which-key').add({ require('which-key').add({
{
buffer = buf,
mkKey(']h', function() mkKey(']h', function()
if vim.wo.diff then if vim.wo.diff then
vim.cmd.normal({ ']c', bang = true }) vim.cmd.normal({ ']c', bang = true })
@ -125,7 +123,6 @@ return {
'󰿚', '󰿚',
{ mode = { 'o', 'x' }, desc = 'select hunk' } { mode = { 'o', 'x' }, desc = 'select hunk' }
), ),
},
}) })
end, end,
}) })

View file

@ -1,5 +0,0 @@
local req = MarleyVim.local_require('plugins.treesitter')
return {
req('nvim-treesitter'),
}

View file

@ -1,55 +0,0 @@
return {
event = { 'BufReadPost', 'BufWritePost', 'BufNewFile', 'DeferredUIEnter' },
keys = {
{ '<C-space>', desc = 'increment selection' },
{ '<BS>', desc = 'decrement selection', mode = 'x' },
},
before = function()
require('lz.n').trigger_load('which-key.nvim')
end,
after = function()
require('nvim-treesitter.configs').setup({
highlight = { enable = true },
indent = { enable = true },
incremental_selection = {
enable = true,
keymaps = {
init_selection = '<C-space>',
node_incremental = '<C-space>',
scope_incremental = false,
node_decremental = '<BS>',
},
},
textobjects = {
move = {
enable = true,
goto_next_start = {
[']f'] = '@function.outer',
[']c'] = '@class.outer',
[']a'] = '@parameter.inner',
},
goto_next_end = {
[']F'] = '@function.outer',
[']C'] = '@class.outer',
[']A'] = '@parameter.inner',
},
goto_previous_tart = {
['[f'] = '@function.outer',
['[c'] = '@class.outer',
['[a'] = '@parameter.inner',
},
goto_previous_end = {
['[F'] = '@function.outer',
['[C'] = '@class.outer',
['[A'] = '@parameter.inner',
},
},
},
})
require('which-key').add({
{ '<BS>', desc = 'decrement selection', mode = 'x' },
{ '<C-space>', desc = 'increment selection', mode = { 'x', 'n' } },
})
end,
}