diff --git a/init.lua b/init.lua index 0810bd1a..778ef851 100644 --- a/init.lua +++ b/init.lua @@ -685,7 +685,8 @@ require('lazy').setup({ -- Disable "format_on_save lsp_fallback" for languages that don't -- have a well standardized coding style. You can add additional -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true } + -- local disable_filetypes = { c = true, cpp = true } + local disable_filetypes = {} local lsp_format_opt if disable_filetypes[vim.bo[bufnr].filetype] then lsp_format_opt = 'never' @@ -917,12 +918,12 @@ require('lazy').setup({ -- Here are some example plugins that I've included in the Kickstart repository. -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- - -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + require 'kickstart.plugins.debug', + require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.lint', + require 'kickstart.plugins.autopairs', + require 'kickstart.plugins.neo-tree', + require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. diff --git a/lua/custom/plugins/bufferline.lua b/lua/custom/plugins/bufferline.lua new file mode 100644 index 00000000..36541763 --- /dev/null +++ b/lua/custom/plugins/bufferline.lua @@ -0,0 +1,12 @@ +return { + 'akinsho/bufferline.nvim', + lazy = false, + config = function() + vim.opt.termguicolors = true + require('bufferline').setup { + options = { + numbers = 'buffer_id', + }, + } + end, +} diff --git a/lua/custom/plugins/hardtime.lua b/lua/custom/plugins/hardtime.lua index bc4be3a9..a222e90a 100644 --- a/lua/custom/plugins/hardtime.lua +++ b/lua/custom/plugins/hardtime.lua @@ -1,6 +1,6 @@ return { - "m4xshen/hardtime.nvim", - lazy = false, - dependencies = {"MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim"}, - opts = {} + -- "m4xshen/hardtime.nvim", + -- lazy = false, + -- dependencies = {"MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim"}, + -- opts = {} } diff --git a/lua/custom/plugins/mappings.lua b/lua/custom/plugins/mappings.lua index 95f481dc..37154341 100644 --- a/lua/custom/plugins/mappings.lua +++ b/lua/custom/plugins/mappings.lua @@ -22,11 +22,19 @@ vim.keymap.set('n', '', ':DecreaseFont', { noremap = true, silent = tru vim.keymap.set('n', '', ':IncreaseFont', { noremap = true, silent = true }) vim.keymap.set('n', '', ':IncreaseFont', { noremap = true, silent = true }) vim.keymap.set('n', '', ':ResetFontSize', { noremap = true, silent = true }) - +vim.keymap.set('n', 'bb', function() + local user_input = vim.fn.input 'Enter input: ' + local row, col = unpack(vim.api.nvim_win_get_cursor(0)) + vim.cmd { cmd = 'b', args = { user_input } } +end) vim.keymap.set('n', '', 'w!', { desc = 'Force write' }) vim.keymap.set('n', '', 'qa!', { desc = 'Force quit' }) vim.keymap.set('n', '|', 'vsplit', { desc = 'Vertical Split' }) vim.keymap.set('n', '\\', 'split', { desc = 'Horizontal Split' }) +vim.keymap.set('n', 'h', 'nohl', { desc = 'Horizontal Split' }) +vim.keymap.set('n', 'h', 'nohl', { desc = 'Horizontal Split' }) +vim.keymap.set('n', 'la', vim.lsp.buf.code_action, { desc = 'Code action' }) + vim.keymap.set('t', '', 'wincmd h', { desc = 'Terminal left window navigation' }) vim.keymap.set('t', '', 'wincmd j', { desc = 'Terminal down window navigation' }) vim.keymap.set('t', '', 'wincmd k', { desc = 'Terminal up window navigation' }) diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index bd442269..3b266fe6 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -11,7 +11,7 @@ return { }, cmd = 'Neotree', keys = { - { '\\', ':Neotree reveal', desc = 'NeoTree reveal', silent = true }, + { 'e', ':Neotree toggle', desc = 'NeoTree reveal', silent = true }, }, opts = { filesystem = {