Merge pull request #1 from ppagni/feat/add-plugins-and-oil-config

feat/add plugins and oil config
This commit is contained in:
Patrick Pagni 2026-06-04 16:46:06 +01:00 committed by GitHub
commit 656c074dc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 102 additions and 7 deletions

View File

@ -214,10 +214,10 @@ do
vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
-- TIP: Disable arrow keys in normal mode
-- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
-- vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
-- vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
-- vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
-- Keybinds to make split navigation easier.
-- Use CTRL+<hjkl> to switch between windows
@ -573,8 +573,14 @@ require('lazy').setup({
branch = 'main',
build = ':TSUpdate',
config = function()
local parsers = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }
require('nvim-treesitter').install(parsers)
local parsers = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'python', 'query', 'sql', 'vim', 'vimdoc' }
require('nvim-treesitter').install(parsers, function(lang, success)
if success then
vim.notify('treesitter: installed ' .. lang, vim.log.levels.INFO)
else
vim.notify('treesitter: failed to install ' .. lang, vim.log.levels.WARN)
end
end)
---@param buf integer
---@param language string
@ -628,5 +634,9 @@ require('lazy').setup({
checker = { enabled = false },
})
-- Open Oil in a floating window
vim.keymap.set("n", "<leader>of", "<CMD>Oil --float<CR>", { desc = "Open Oil float" })
-- The line beneath this is called `modeline`. See `:help modeline`
-- vim: ts=2 sts=2 sw=2 et

View File

@ -29,7 +29,10 @@
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "7d324792b7943e4aa16ad007212e6acc6f9fe335" },
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
"tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" },
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
"vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
"wezterm.nvim": { "branch": "main", "commit": "032c33b621b96cc7228955b4352b48141c482098" },
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
}

View File

@ -0,0 +1,3 @@
return {
"tpope/vim-fugitive",
}

View File

@ -3,6 +3,30 @@ return {
dependencies = { 'nvim-mini/mini.nvim' },
config = function()
require('mini.icons').setup()
require('oil').setup()
require('oil').setup {
view_options = {
show_hidden = false,
is_hidden_file = function(name, bufnr)
return vim.startswith(name, '.')
end,
is_always_hidden = function(name, bufnr)
return false
end,
natural_order = false,
sort = {
{ 'type', 'asc' },
{ 'name', 'asc' },
},
},
keymaps = {
['<leader>th'] = {
callback = function()
require('oil').toggle_hidden()
end,
desc = 'Toggle hidden files',
mode = 'n',
},
},
}
end,
}

View File

@ -0,0 +1,18 @@
return {
'akinsho/toggleterm.nvim',
version = '*',
opts = {
open_mapping = [[<leader>tt]],
},
config = function(_, opts)
require('toggleterm').setup(opts)
vim.keymap.set('t', '<Esc>', [[<C-\><C-n>]], { desc = 'Exit terminal mode' })
local lazygit = require('toggleterm.terminal').Terminal:new({
cmd = 'lazygit',
direction = 'float',
hidden = true,
})
vim.keymap.set('n', '<leader>tg', function() lazygit:toggle() end, { desc = 'Toggle lazygit' })
end,
}

View File

@ -0,0 +1,37 @@
return {
"folke/trouble.nvim",
opts = {}, -- for default options, refer to the configuration section for custom setup.
cmd = "Trouble",
keys = {
{
"<leader>xx",
"<cmd>Trouble diagnostics toggle<cr>",
desc = "Diagnostics (Trouble)",
},
{
"<leader>xX",
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
desc = "Buffer Diagnostics (Trouble)",
},
{
"<leader>cs",
"<cmd>Trouble symbols toggle focus=false<cr>",
desc = "Symbols (Trouble)",
},
{
"<leader>cl",
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
desc = "LSP Definitions / references / ... (Trouble)",
},
{
"<leader>xL",
"<cmd>Trouble loclist toggle<cr>",
desc = "Location List (Trouble)",
},
{
"<leader>xQ",
"<cmd>Trouble qflist toggle<cr>",
desc = "Quickfix List (Trouble)",
},
},
}