V2 #1

Merged
wonderfulfrog merged 20 commits from v2 into main 2024-05-10 11:26:26 -07:00
7 changed files with 124 additions and 109 deletions
Showing only changes of commit 9a9e5cf5f9 - Show all commits

View file

@ -3,7 +3,9 @@
"alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"conform.nvim": { "branch": "master", "commit": "4660e534bf7678ee0f85879aa75fdcb6855612c2" },
"flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
"friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
"gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" },
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
"lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
@ -20,6 +22,7 @@
"nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
"nvim-lint": { "branch": "master", "commit": "f098232d70cebe90e27404928c9bc19ca7a5a7b5" },
"nvim-lspconfig": { "branch": "master", "commit": "7133e85c3df14a387da8942c094c7edddcdef309" },
"nvim-spectre": { "branch": "master", "commit": "026394a8458d62c6b7b305c076ce675420dbaa4c" },
"nvim-treesitter": { "branch": "master", "commit": "3ef8d25df2d8eca6f15a6889cb2bc9d4c6101096" },
"nvim-treesitter-context": { "branch": "master", "commit": "4fe0a54e86859744968e1a5c7867b49c86855774" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" },

121
lua/plugins/editor.lua Normal file
View file

@ -0,0 +1,121 @@
return {
{
"nvim-neo-tree/neo-tree.nvim",
branch = "v3.x",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
},
config = function()
vim.keymap.set("n", "<Leader>ee", ":Neotree toggle<CR>", { desc = "Toggle Neotree" })
vim.keymap.set("n", "<Leader>er", ":Neotree reveal<CR>", { desc = "Reveal file" })
local nt = require("neo-tree")
nt.setup({
open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
filesystem = {
filtered_items = {
show_hidden_count = false,
hide_dotfiles = false,
hide_gitignored = true,
always_show = {
".env",
},
never_show = {
".git",
"thumbs.db",
".DS_Store",
},
},
},
window = {
mappings = {
["m"] = {
"move",
config = {
show_path = "relative",
},
},
},
},
event_handlers = {
{
event = "neo_tree_popup_input_ready",
handler = function()
-- Switch to normal inside popups by default.
vim.cmd.stopinsert()
end,
},
},
})
end,
},
{
"folke/which-key.nvim",
event = "VeryLazy",
init = function()
vim.o.timeout = true
vim.o.timeoutlen = 300
end,
opts = {},
},
{
"folke/trouble.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
config = function()
vim.keymap.set("n", "<Leader>tt", ":TroubleToggle<CR>", { desc = "Toggle Trouble" })
end,
},
{
"folke/todo-comments.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
opts = {},
},
{
"nvim-pack/nvim-spectre",
dependencies = { "nvim-lua/plenary.nvim" },
opts = { open_cmd = "noswapfile vnew" },
keys = {
{
"<leader>sr",
function()
require("spectre").open()
end,
desc = "Replace in Files (Spectre)",
},
},
},
{
"nvim-telescope/telescope.nvim",
tag = "0.1.5",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
local builtin = require("telescope.builtin")
vim.keymap.set("n", "<Leader>ff", builtin.git_files, { desc = "Search git_files" })
vim.keymap.set("n", "<Leader>fg", builtin.live_grep, { desc = "Grep git_files" })
vim.keymap.set("n", "<Leader>fh", builtin.help_tags, { desc = "View help tags" })
vim.keymap.set("n", "<Leader>fb", builtin.buffers, { desc = "Search buffers" })
vim.keymap.set("n", "<Leader>sR", builtin.resume, { desc = "Resume" })
end,
},
{
"nvim-telescope/telescope-ui-select.nvim",
config = function()
require("telescope").setup({
defaults = {
initial_mode = "normal",
},
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown({}),
},
},
})
require("telescope").load_extension("ui-select")
end,
},
}

View file

@ -1,52 +0,0 @@
return {
"nvim-neo-tree/neo-tree.nvim",
branch = "v3.x",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
},
config = function()
vim.keymap.set("n", "<Leader>nn", ":Neotree toggle<CR>", { desc = "Toggle Neotree" })
local nt = require("neo-tree")
nt.setup({
open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
filesystem = {
filtered_items = {
show_hidden_count = false,
hide_dotfiles = false,
hide_gitignored = true,
always_show = {
".env",
},
never_show = {
".git",
"thumbs.db",
".DS_Store",
},
},
},
window = {
mappings = {
["m"] = {
"move",
config = {
show_path = "relative",
},
},
},
},
event_handlers = {
{
event = "neo_tree_popup_input_ready",
handler = function()
-- Switch to normal inside popups by default.
vim.cmd.stopinsert()
end,
},
},
})
end,
}

View file

@ -1,36 +0,0 @@
return {
{
'nvim-telescope/telescope.nvim',
tag = '0.1.5',
dependencies = { 'nvim-lua/plenary.nvim' },
config = function()
local builtin = require('telescope.builtin')
vim.keymap.set('n', '<Leader>pp', builtin.git_files, { desc = "Search git_files" })
vim.keymap.set('n', '<Leader>pf', builtin.find_files, { desc = "Search all files " })
vim.keymap.set('n', '<Leader>fh', builtin.help_tags, { desc = "View help tags" })
vim.keymap.set('n', '<Leader>gc', builtin.git_branches, { desc = "Checkout git branches" })
vim.keymap.set('n', '<Leader>ps', function()
builtin.grep_string({ search = vim.fn.input("Grep > ") })
end, { desc = "Grep entire project for string" })
vim.keymap.set('n', '<Leader>b', builtin.buffers, { desc = "Search buffers" })
end
},
{
"nvim-telescope/telescope-ui-select.nvim",
config = function()
require("telescope").setup {
defaults = {
initial_mode = "normal"
},
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown {}
}
}
}
require("telescope").load_extension("ui-select")
end
}
}

View file

@ -1,5 +0,0 @@
return {
"folke/todo-comments.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
opts = {},
}

View file

@ -1,7 +0,0 @@
return {
"folke/trouble.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
config = function()
vim.keymap.set("n", "<Leader>tt", ":TroubleToggle<CR>", { desc = "Toggle Trouble" })
end
}

View file

@ -1,9 +0,0 @@
return {
"folke/which-key.nvim",
event = "VeryLazy",
init = function()
vim.o.timeout = true
vim.o.timeoutlen = 300
end,
opts = {}
}