diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index ad54390..a470643 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -4,9 +4,9 @@ require'nvim-treesitter.configs'.setup { auto_install = true, highlight = { enable = true, - additional_vim_regex_highlighting = false, }, indent = { - enable = true + enable = true, + disable = {'python',} }, } diff --git a/.config/nvim/lua/adam/init.lua b/.config/nvim/lua/adam/init.lua index 7a564a3..9034e94 100644 --- a/.config/nvim/lua/adam/init.lua +++ b/.config/nvim/lua/adam/init.lua @@ -1,4 +1,3 @@ require('adam.set') require('adam.remap') -require('adam.ensure') require('adam.packer') diff --git a/.config/nvim/lua/adam/remap.lua b/.config/nvim/lua/adam/remap.lua index 894f922..8e54091 100644 --- a/.config/nvim/lua/adam/remap.lua +++ b/.config/nvim/lua/adam/remap.lua @@ -1,33 +1,51 @@ +-- Shortcuts vim.keymap.set('n', 'pv', vim.cmd.Ex) vim.keymap.set('n', 'pS', vim.cmd.PackerSync) +vim.keymap.set('n', 'm', vim.cmd.Mason) +-- Select and Drag vim.keymap.set("v", "J", ":m '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv") +-- J without moving cursor vim.keymap.set('n', 'J', 'mzJ`z') + +-- Center cursor when jumping vim.keymap.set('n', '', 'zz') vim.keymap.set('n', '', 'zz') + +-- Center cursor during search vim.keymap.set('n', 'n', 'nzzzv') vim.keymap.set('n', 'N', 'Nzzzv') +-- Paste without yank vim.keymap.set('x', 'p', '\"_dP') +-- Delete without yank +vim.keymap.set('n', 'd', '\"_d') +vim.keymap.set('v', 'd', '\"_d') + +-- yank to system clipboard vim.keymap.set('n', 'y', '\"+y') vim.keymap.set('v', 'y', '\"+y') vim.keymap.set('n', 'Y', '\"+Y') -vim.keymap.set('n', 'd', '\"_d') -vim.keymap.set('v', 'd', '\"_d') - +-- no vim.keymap.set('n', 'Q', '') + +-- Format vim.keymap.set('n', 'f', function() vim.lsp.buf.format() end) +-- quickfix vim.keymap.set('n', '', 'cnextzz') vim.keymap.set('n', '', 'cprevzz') vim.keymap.set('n', 'k', 'lnextzz') vim.keymap.set('n', 'j', 'lprevzz') +-- Super substitute vim.keymap.set('n', 's', [[:%s/\<\>//gI]]) + +-- make current script executable vim.keymap.set('n', 'x', '!chmod +x %', { silent = true })