feat!: rework config a bit, add some qol changes
This commit is contained in:
71
.config/nvim/lua/rocketcamel/plugins/cmp.lua
Normal file
71
.config/nvim/lua/rocketcamel/plugins/cmp.lua
Normal file
@@ -0,0 +1,71 @@
|
||||
local function setup_keybinds()
|
||||
vim.keymap.set("n", "gd", vim.lsp.buf.definition)
|
||||
vim.keymap.set("n", "ev", function()
|
||||
vim.diagnostic.open_float({ border = "rounded" })
|
||||
end)
|
||||
vim.keymap.set("n", "K", function()
|
||||
vim.lsp.buf.hover({ border = "rounded" })
|
||||
end)
|
||||
vim.keymap.set("i", "<C-s>", function()
|
||||
vim.lsp.buf.signature_help({ border = "rounded" })
|
||||
end)
|
||||
vim.diagnostic.config({ virtual_text = true })
|
||||
end
|
||||
|
||||
return {
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = { "hrsh7th/cmp-cmdline",
|
||||
"hrsh7th/cmp-path",
|
||||
"hrsh7th/cmp-buffer",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
},
|
||||
config = function()
|
||||
local cmp = require("cmp")
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require("luasnip").lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.abort(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
}, {
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
})
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
setup_keybinds()
|
||||
vim.lsp.config("*", {
|
||||
capabilities = capabilities,
|
||||
})
|
||||
cmp.setup.cmdline({ "/", "?" }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = "buffer" },
|
||||
},
|
||||
})
|
||||
cmp.setup.cmdline(":", {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
}, {
|
||||
{ name = "cmdline" },
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false },
|
||||
})
|
||||
end
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
return {
|
||||
{ "tpope/vim-fugitive" },
|
||||
}
|
||||
11
.config/nvim/lua/rocketcamel/plugins/git.lua
Normal file
11
.config/nvim/lua/rocketcamel/plugins/git.lua
Normal file
@@ -0,0 +1,11 @@
|
||||
return {
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
config = function()
|
||||
require("gitsigns").setup()
|
||||
end
|
||||
},
|
||||
{
|
||||
"tpope/vim-fugitive",
|
||||
}
|
||||
}
|
||||
@@ -1,122 +1,117 @@
|
||||
local function setup_luau()
|
||||
require("luau-lsp").setup({
|
||||
platform = {
|
||||
type = "roblox",
|
||||
},
|
||||
types = {
|
||||
roblox_security_level = "PluginSecurity",
|
||||
},
|
||||
sourcemap = {
|
||||
enabled = true,
|
||||
autogenerate = true,
|
||||
rojo_project_file = "default.project.json",
|
||||
sourcemap_file = "sourcemap.json",
|
||||
},
|
||||
plugin = {
|
||||
enabled = true,
|
||||
port = 3667,
|
||||
},
|
||||
fflags = {
|
||||
enable_new_solver = true,
|
||||
sync = true,
|
||||
},
|
||||
})
|
||||
require("luau-lsp").setup({
|
||||
platform = {
|
||||
type = "roblox",
|
||||
},
|
||||
types = {
|
||||
roblox_security_level = "PluginSecurity",
|
||||
},
|
||||
sourcemap = {
|
||||
enabled = true,
|
||||
autogenerate = true,
|
||||
rojo_project_file = "default.project.json",
|
||||
sourcemap_file = "sourcemap.json",
|
||||
},
|
||||
plugin = {
|
||||
enabled = true,
|
||||
port = 3667,
|
||||
},
|
||||
fflags = {
|
||||
enable_new_solver = true,
|
||||
sync = true,
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
return {
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
"williamboman/mason.nvim",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"j-hui/fidget.nvim",
|
||||
"lopi-py/luau-lsp.nvim",
|
||||
"hrsh7th/nvim-cmp",
|
||||
"hrsh7th/cmp-cmdline",
|
||||
"hrsh7th/cmp-path",
|
||||
"hrsh7th/cmp-buffer",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
"williamboman/mason.nvim",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"j-hui/fidget.nvim",
|
||||
"lopi-py/luau-lsp.nvim",
|
||||
},
|
||||
config = function()
|
||||
require("mason").setup()
|
||||
require("fidget").setup({
|
||||
notification = {
|
||||
window = {
|
||||
winblend = 0,
|
||||
},
|
||||
},
|
||||
})
|
||||
require("mason-lspconfig").setup({
|
||||
ensure_installed = {
|
||||
"ts_ls",
|
||||
"lua_ls",
|
||||
"luau_lsp",
|
||||
"rust_analyzer",
|
||||
"nil_ls",
|
||||
"tailwindcss",
|
||||
"svelte",
|
||||
"html",
|
||||
"gopls",
|
||||
"templ",
|
||||
},
|
||||
automatic_enable = { exclude = { "luau_lsp" } },
|
||||
})
|
||||
setup_luau()
|
||||
local cmp = require("cmp")
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require("luasnip").lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.abort(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
}, {
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
})
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
vim.lsp.config("*", {
|
||||
capabilities = capabilities,
|
||||
})
|
||||
vim.keymap.set("n", "gtd", vim.lsp.buf.definition)
|
||||
vim.keymap.set("n", "ev", function()
|
||||
vim.diagnostic.open_float({ border = "rounded" })
|
||||
end)
|
||||
vim.keymap.set("n", "K", function()
|
||||
vim.lsp.buf.hover({ border = "rounded" })
|
||||
end)
|
||||
vim.keymap.set("i", "<C-s>", function()
|
||||
vim.lsp.buf.signature_help({ border = "rounded" })
|
||||
end)
|
||||
vim.diagnostic.config({ virtual_text = true })
|
||||
cmp.setup.cmdline({ "/", "?" }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = "buffer" },
|
||||
},
|
||||
})
|
||||
cmp.setup.cmdline(":", {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
}, {
|
||||
{ name = "cmdline" },
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false },
|
||||
})
|
||||
end,
|
||||
},
|
||||
config = function()
|
||||
require("mason").setup()
|
||||
require("fidget").setup({
|
||||
notification = {
|
||||
window = {
|
||||
winblend = 0,
|
||||
},
|
||||
},
|
||||
})
|
||||
require("mason-lspconfig").setup({
|
||||
ensure_installed = {
|
||||
"ts_ls",
|
||||
"lua_ls",
|
||||
"luau_lsp",
|
||||
"rust_analyzer",
|
||||
"nil_ls",
|
||||
"tailwindcss",
|
||||
"svelte",
|
||||
"html",
|
||||
"gopls",
|
||||
"templ",
|
||||
},
|
||||
automatic_enable = { exclude = { "luau_lsp" } },
|
||||
})
|
||||
setup_luau()
|
||||
local cmp = require("cmp")
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require("luasnip").lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.abort(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
}, {
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
})
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
vim.lsp.config("*", {
|
||||
capabilities = capabilities,
|
||||
})
|
||||
vim.keymap.set("n", "gtd", vim.lsp.buf.definition)
|
||||
vim.keymap.set("n", "ev", function()
|
||||
vim.diagnostic.open_float({ border = "rounded" })
|
||||
end)
|
||||
vim.keymap.set("n", "K", function()
|
||||
vim.lsp.buf.hover({ border = "rounded" })
|
||||
end)
|
||||
vim.keymap.set("i", "<C-s>", function()
|
||||
vim.lsp.buf.signature_help({ border = "rounded" })
|
||||
end)
|
||||
vim.diagnostic.config({ virtual_text = true })
|
||||
cmp.setup.cmdline({ "/", "?" }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = "buffer" },
|
||||
},
|
||||
})
|
||||
cmp.setup.cmdline(":", {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
}, {
|
||||
{ name = "cmdline" },
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false },
|
||||
})
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
11
.config/nvim/lua/rocketcamel/plugins/lualine.lua
Normal file
11
.config/nvim/lua/rocketcamel/plugins/lualine.lua
Normal file
@@ -0,0 +1,11 @@
|
||||
return {
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||
config = function()
|
||||
require("lualine").setup({
|
||||
options = { theme = "rose-pine" }
|
||||
})
|
||||
end
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,23 @@
|
||||
return {
|
||||
{
|
||||
"nvim-tree/nvim-tree.lua",
|
||||
config = function()
|
||||
require("nvim-tree").setup()
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvim-tree/nvim-tree.lua",
|
||||
config = function()
|
||||
require("nvim-tree").setup({
|
||||
view = { width = 30, side = "left" },
|
||||
filters = { dotfiles = false },
|
||||
update_focused_file = {
|
||||
enable = true,
|
||||
update_cwd = true,
|
||||
ignore_list = {}
|
||||
},
|
||||
actions = {
|
||||
open_file = {
|
||||
quit_on_open = false,
|
||||
resize_window = true,
|
||||
}
|
||||
}
|
||||
})
|
||||
vim.keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>", { desc = "Toggle file explorer" })
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -1,20 +1,32 @@
|
||||
return {
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
dependencies = {
|
||||
"LukasPietzschmann/telescope-tabs",
|
||||
},
|
||||
config = function()
|
||||
local telescope = require("telescope")
|
||||
local telescope_tabs = require("telescope-tabs")
|
||||
local builtin = require("telescope.builtin")
|
||||
telescope.load_extension("telescope-tabs")
|
||||
telescope_tabs.setup()
|
||||
vim.keymap.set("n", "<leader>pf", builtin.find_files, {})
|
||||
vim.keymap.set("n", "<C-p>", builtin.git_files, {})
|
||||
vim.keymap.set("n", "<leader>pb", builtin.buffers)
|
||||
vim.keymap.set("n", "<leader>ps", builtin.live_grep)
|
||||
vim.keymap.set("n", "<leader>pt", telescope_tabs.list_tabs)
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
dependencies = {
|
||||
"LukasPietzschmann/telescope-tabs",
|
||||
},
|
||||
config = function()
|
||||
local telescope = require("telescope")
|
||||
local telescope_tabs = require("telescope-tabs")
|
||||
local builtin = require("telescope.builtin")
|
||||
telescope.setup({
|
||||
pickers = {
|
||||
find_files = {
|
||||
hidden = true,
|
||||
},
|
||||
live_grep = {
|
||||
additional_args = function()
|
||||
return {"--hidden"}
|
||||
end
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
telescope.load_extension("telescope-tabs")
|
||||
telescope_tabs.setup()
|
||||
vim.keymap.set("n", "<C-p>", builtin.find_files, { desc = "Find files" })
|
||||
vim.keymap.set("n", "<leader>fb", builtin.buffers, { desc = "Find buffers" })
|
||||
vim.keymap.set("n", "<leader>fg", builtin.live_grep, { desc = "Search" })
|
||||
vim.keymap.set("n", "<leader>ft", telescope_tabs.list_tabs)
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
return {
|
||||
{
|
||||
"rose-pine/neovim",
|
||||
dependencies = {
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
},
|
||||
config = function()
|
||||
require("rose-pine").setup({
|
||||
styles = {
|
||||
transparency = true,
|
||||
},
|
||||
})
|
||||
vim.cmd("colorscheme rose-pine")
|
||||
end,
|
||||
},
|
||||
{
|
||||
"rose-pine/neovim",
|
||||
dependencies = {
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
},
|
||||
config = function()
|
||||
require("rose-pine").setup({
|
||||
styles = {
|
||||
transparency = false,
|
||||
},
|
||||
})
|
||||
vim.cmd.colorscheme("rose-pine")
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user