diff options
5 files changed, 19 insertions, 7 deletions
diff --git a/nvim/.config/nvim/lua/eugenetriguba/autocmds.lua b/nvim/.config/nvim/lua/eugenetriguba/autocmds.lua index 145d00a..01d6aff 100644 --- a/nvim/.config/nvim/lua/eugenetriguba/autocmds.lua +++ b/nvim/.config/nvim/lua/eugenetriguba/autocmds.lua @@ -6,3 +6,10 @@ vim.api.nvim_create_autocmd('TextYankPost', { vim.hl.on_yank() end, }) + +vim.api.nvim_create_autocmd('FileType', { + callback = function() + vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' + vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" + end, +}) diff --git a/nvim/.config/nvim/lua/eugenetriguba/keymaps.lua b/nvim/.config/nvim/lua/eugenetriguba/keymaps.lua index 763d184..212c8f4 100644 --- a/nvim/.config/nvim/lua/eugenetriguba/keymaps.lua +++ b/nvim/.config/nvim/lua/eugenetriguba/keymaps.lua @@ -1,7 +1,7 @@ local map = vim.keymap.set -map("n", "<leader>sh", ":split<CR>") -map("n", "<leader>sv", ":vsplit<CR>") +map('n', '<leader>sh', ':split<CR>') +map('n', '<leader>sv', ':vsplit<CR>') -- Clear highlights on search when pressing <Esc> in normal mode map('n', '<Esc>', '<cmd>nohlsearch<CR>') @@ -23,14 +23,14 @@ map('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' }) map('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' }) -- Keybindings to cycle through open tabs easier -map('n', '<M-,>', '<cmd>tabprevious<CR>', { desc = 'Open tab to the left' }) -map('n', '<M-.>', '<cmd>tabnext<CR>', { desc = 'Open tab to the right' }) +map('n', '<M-,>', '<cmd>bprevious<CR>', { desc = 'Open buffer to the left' }) +map('n', '<M-.>', '<cmd>bnext<CR>', { desc = 'Open buffer to the right' }) local function confirm_and_delete_buffer() - local confirm = vim.fn.confirm("Delete buffer and file?", "&Y\n&N", 2) + local confirm = vim.fn.confirm('Delete buffer and file?', '&Y\n&N', 2) if confirm == 1 then - os.remove(vim.fn.expand "%") + os.remove(vim.fn.expand '%') vim.api.nvim_buf_delete(0, { force = true }) end end diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/conform.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/conform.lua index d177759..c11d4f9 100644 --- a/nvim/.config/nvim/lua/eugenetriguba/plugins/conform.lua +++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/conform.lua @@ -35,7 +35,7 @@ vim.api.nvim_create_autocmd('VimEnter', { sh = { 'shfmt' }, cpp = { 'clang-format' }, c = { 'clang-format' }, - tf = { 'terraformfmt' }, + tf = { 'terraform_fmt' }, }, formatters = { isort = { diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/harpoon.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/harpoon.lua index 6d3b050..d3ac276 100644 --- a/nvim/.config/nvim/lua/eugenetriguba/plugins/harpoon.lua +++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/harpoon.lua @@ -36,6 +36,10 @@ vim.api.nvim_create_autocmd('VimEnter', { harpoon:list():select(4) end) + vim.keymap.set('n', '<C-x>', function() + harpoon:list():clear() + end, { desc = 'Clear Harpoon list' }) + vim.keymap.set('n', '<leader>hp', function() harpoon:list():prev() end) diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua index 07c8157..3fb452c 100644 --- a/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua +++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua @@ -10,6 +10,7 @@ vim.pack.add { }, } +require 'nvim-treesitter' require('nvim-treesitter.configs').setup { ensure_installed = 'all', auto_install = true, |