diff options
author | crupest <crupest@outlook.com> | 2023-09-08 17:57:37 +0800 |
---|---|---|
committer | crupest <crupest@outlook.com> | 2023-09-14 20:45:48 +0800 |
commit | e1bf2af8e57f54476c71f20513ad1d4c9e9cb770 (patch) | |
tree | 52b4807ec9ac2cc3d445fb6d5950e808314bb215 | |
parent | 51020952fc2f99ace8873514f3223ce4b84580b8 (diff) | |
download | crupest-e1bf2af8e57f54476c71f20513ad1d4c9e9cb770.tar.gz crupest-e1bf2af8e57f54476c71f20513ad1d4c9e9cb770.tar.bz2 crupest-e1bf2af8e57f54476c71f20513ad1d4c9e9cb770.zip |
Update nvim config.
-rw-r--r-- | configs/nvim/init.lua | 18 | ||||
-rw-r--r-- | configs/nvim/lua/crupest/nvim.lua | 5 |
2 files changed, 15 insertions, 8 deletions
diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua index e5d8d35..51b4808 100644 --- a/configs/nvim/init.lua +++ b/configs/nvim/init.lua @@ -49,7 +49,6 @@ require("lazy").setup("plugins") require("nvim-tree").setup() local nvim_tree_api = require("nvim-tree.api") -vim.keymap.set('n', '<leader>t', nvim_tree_api.tree.toggle, {}) vim.api.nvim_create_autocmd("DirChanged", { pattern = "global", callback = function(args) @@ -240,13 +239,6 @@ vim.keymap.set('n', '<leader>h', builtin.help_tags, {}) -- setup keymap fnamemodifyfor lsp --- Global mappings. --- See `:help vim.diagnostic.*` for documentation on any of the below functions -vim.keymap.set('n', '<space>e', vim.diagnostic.open_float) -vim.keymap.set('n', '[d', vim.diagnostic.goto_prev) -vim.keymap.set('n', ']d', vim.diagnostic.goto_next) -vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist) - -- Use LspAttach autocommand to only map the following keys -- after the language server attaches to the current buffer vim.api.nvim_create_autocmd('LspAttach', { @@ -285,6 +277,16 @@ require("catppuccin").setup{ vim.cmd.colorscheme "catppuccin" -- custom keymaps +vim.keymap.set('n', '<leader>tt', nvim_tree_api.tree.toggle, {}) +vim.keymap.set('n', '<leader>tr', '<cmd>NvimTreeRefresh<cr>') + +-- See `:help vim.diagnostic.*` for documentation on any of the below functions +vim.keymap.set('n', '<leader>le', vim.diagnostic.open_float) +vim.keymap.set('n', '<leader>l[', vim.diagnostic.goto_prev) +vim.keymap.set('n', '<leader>l]', vim.diagnostic.goto_next) +vim.keymap.set('n', '<leader>lt', vim.diagnostic.setloclist) +vim.keymap.set('n', '<leader>ll', lint.try_lint) + vim.keymap.set("n", "<c-tab>", "<cmd>bnext<cr>") vim.keymap.set("n", "<c-s-tab>", "<cmd>bNext<cr>") diff --git a/configs/nvim/lua/crupest/nvim.lua b/configs/nvim/lua/crupest/nvim.lua index c47b7d5..67bb3b0 100644 --- a/configs/nvim/lua/crupest/nvim.lua +++ b/configs/nvim/lua/crupest/nvim.lua @@ -54,6 +54,11 @@ end -- If no previous buffer (no other buffers), create a unnamed one. (So the window does not quit.) local function win_close_buf() local buf = vim.api.nvim_get_current_buf() + + if vim.fn.bufexists(buf) == 0 or vim.fn.buflisted(buf) == 0 then + return + end + local jumps_info = vim.fn.getjumplist() local old_jumps = { unpack(jumps_info[1], 1, jumps_info[2]) } |