cumulative update
This commit is contained in:
parent
3ecbac352e
commit
c360fc2339
71 changed files with 3281 additions and 380 deletions
|
|
@ -2,7 +2,7 @@ require("cmake-tools").setup {
|
|||
cmake_command = "cmake", -- this is used to specify cmake command path
|
||||
cmake_regenerate_on_save = true, -- auto generate when save CMakeLists.txt
|
||||
cmake_generate_options = { "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" }, -- this will be passed when invoke `CMakeGenerate`
|
||||
cmake_build_options = {}, -- this will be passed when invoke `CMakeBuild`
|
||||
cmake_build_options = { "-j14" }, -- this will be passed when invoke `CMakeBuild`
|
||||
-- support macro expansion:
|
||||
-- ${kit}
|
||||
-- ${kitGenerator}
|
||||
|
|
@ -60,16 +60,15 @@ require("cmake-tools").setup {
|
|||
},
|
||||
},
|
||||
cmake_notifications = {
|
||||
enabled = false, -- show cmake execution progress in nvim-notify
|
||||
enabled = true, -- show cmake execution progress in nvim-notify
|
||||
spinner = { "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" }, -- icons used for progress display
|
||||
refresh_rate_ms = 100, -- how often to iterate icons
|
||||
},
|
||||
}
|
||||
|
||||
local map = vim.keymap.set
|
||||
|
||||
-- Mappings
|
||||
map('n', '<leader>b', ':CMakeBuild<CR>')
|
||||
map('n', '<leader>c', ':CMakeClose<CR>')
|
||||
map('n', '<leader>r', ':CMakeRun<CR>')
|
||||
vim.keymap.set('n', '<leader>b', ':CMakeBuild<CR>')
|
||||
vim.keymap.set('n', '<leader>c', ':CMakeClose<CR>')
|
||||
vim.keymap.set('n', '<leader>r', ':CMakeRun<CR>')
|
||||
vim.keymap.set('n', '<leader>G', ':CMakeGenerate<CR>')
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
local map = vim.keymap.set
|
||||
|
||||
map('n', '<C-_>', require('Comment.api').toggle.linewise.current)
|
||||
map('i', '<C-_>', require('Comment.api').toggle.linewise.current)
|
||||
map('x', '<C-_>', function()
|
||||
map({ 'n', 'i' }, '<C-_>', require('Comment.api').toggle.linewise.current)
|
||||
|
||||
map('v', '<C-_>', function()
|
||||
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('<ESC>', true, false, true), 'nx', false)
|
||||
require('Comment.api').toggle.linewise(vim.fn.visualmode())
|
||||
end
|
||||
|
|
|
|||
|
|
@ -7,3 +7,4 @@ require('config.plugins.nvim-tree')
|
|||
require('config.plugins.telescope')
|
||||
require('config.plugins.treesitter')
|
||||
require('config.plugins.navigator')
|
||||
require('config.plugins.trouble')
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
require('nvim-autopairs').setup({
|
||||
disable_filetype = { "TelescopePrompt" , "vim" },
|
||||
enable_check_bracket_line = false,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,15 @@
|
|||
vim.g.loaded_netrw = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
|
||||
require("nvim-tree").setup()
|
||||
require("nvim-tree").setup({
|
||||
update_focused_file = {
|
||||
enable = true,
|
||||
update_root = false,
|
||||
ignore_list = { "help" },
|
||||
},
|
||||
filters = {
|
||||
custom = { '.git' },
|
||||
},
|
||||
})
|
||||
|
||||
vim.keymap.set('n', '<C-b>', ':NvimTreeToggle<CR>')
|
||||
vim.keymap.set('n', '<C-m>', ':NvimTreeToggle<CR>', { silent=true })
|
||||
|
|
|
|||
|
|
@ -9,18 +9,15 @@ require('telescope').setup {
|
|||
},
|
||||
}
|
||||
|
||||
-- Enable telescope fzf native, if installed
|
||||
pcall(require('telescope').load_extension, 'fzf')
|
||||
|
||||
-- See `:help telescope.builtin`
|
||||
vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
|
||||
-- vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
|
||||
vim.keymap.set('n', '<leader>/', function()
|
||||
-- You can pass additional configuration to telescope to change theme, layout, etc.
|
||||
require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
|
||||
winblend = 10,
|
||||
previewer = false,
|
||||
})
|
||||
|
||||
end, { desc = '[/] Fuzzily search in current buffer' })
|
||||
|
||||
vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
|
||||
|
|
@ -30,3 +27,4 @@ vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { de
|
|||
vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
|
||||
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
|
||||
vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' })
|
||||
vim.keymap.set('n', '<leader>sm', require('telescope.builtin').treesitter)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ vim.defer_fn(function()
|
|||
ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
|
||||
|
||||
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
|
||||
auto_install = false,
|
||||
auto_install = true,
|
||||
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
|
|
@ -51,15 +51,7 @@ vim.defer_fn(function()
|
|||
['[]'] = '@class.outer',
|
||||
},
|
||||
},
|
||||
swap = {
|
||||
enable = true,
|
||||
swap_next = {
|
||||
['<leader>a'] = '@parameter.inner',
|
||||
},
|
||||
swap_previous = {
|
||||
['<leader>A'] = '@parameter.inner',
|
||||
},
|
||||
},
|
||||
swap = { enable = false, },
|
||||
},
|
||||
}
|
||||
end, 0)
|
||||
|
|
|
|||
6
.config/nvim/lua/config/plugins/trouble.lua
Normal file
6
.config/nvim/lua/config/plugins/trouble.lua
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end)
|
||||
vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end)
|
||||
vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end)
|
||||
vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end)
|
||||
vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end)
|
||||
vim.keymap.set("n", "gR", function() require("trouble").toggle("lsp_references") end)
|
||||
Loading…
Add table
Add a link
Reference in a new issue