feat: plugin cleanup
This commit is contained in:
2
init.lua
2
init.lua
@@ -25,7 +25,7 @@ vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,
|
|||||||
-- ╭─────────────╮
|
-- ╭─────────────╮
|
||||||
-- │ Colorscheme │
|
-- │ Colorscheme │
|
||||||
-- ╰─────────────╯
|
-- ╰─────────────╯
|
||||||
vim.cmd("colorscheme rose-pine") -- rose-pine, gruvbox, koda-{dark/light/moss/glade}, komau
|
vim.cmd("colorscheme komau") -- rose-pine, gruvbox, koda-{dark/light/moss/glade}, komau
|
||||||
vim.o.background = "dark" -- "dark" or "light"
|
vim.o.background = "dark" -- "dark" or "light"
|
||||||
|
|
||||||
-- ╭───────────────────╮
|
-- ╭───────────────────╮
|
||||||
|
|||||||
@@ -22,9 +22,8 @@
|
|||||||
"multiple-cursors.nvim": { "branch": "main", "commit": "1ac15d047a4b265cc2389957bcc56ee561b29e02" },
|
"multiple-cursors.nvim": { "branch": "main", "commit": "1ac15d047a4b265cc2389957bcc56ee561b29e02" },
|
||||||
"neo-tree.nvim": { "branch": "main", "commit": "b01ee1769144c4491ea44bc329cb84040e9793be" },
|
"neo-tree.nvim": { "branch": "main", "commit": "b01ee1769144c4491ea44bc329cb84040e9793be" },
|
||||||
"no-neck-pain.nvim": { "branch": "main", "commit": "434fed70b1ee553f8f27e6da7b3899f71b3c6f99" },
|
"no-neck-pain.nvim": { "branch": "main", "commit": "434fed70b1ee553f8f27e6da7b3899f71b3c6f99" },
|
||||||
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
|
|
||||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||||
"nvim-colorizer.lua": { "branch": "master", "commit": "664c0b7cea1de71f8b65dfe951b7996fc3e6ccde" },
|
"nvim-colorizer.lua": { "branch": "master", "commit": "149fbd9f5e25511b0a8bad3ccecd43d1bc584f86" },
|
||||||
"nvim-lint": { "branch": "master", "commit": "a219b2c9e5b4765e5c845aba119dad55806fcaf1" },
|
"nvim-lint": { "branch": "master", "commit": "a219b2c9e5b4765e5c845aba119dad55806fcaf1" },
|
||||||
"nvim-scrollbar": { "branch": "main", "commit": "f8e87b96cd6362ef8579be456afee3b38fd7e2a8" },
|
"nvim-scrollbar": { "branch": "main", "commit": "f8e87b96cd6362ef8579be456afee3b38fd7e2a8" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
|
"nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
|
||||||
|
|||||||
@@ -48,6 +48,8 @@ map("n", "<leader>ct", "<cmd>lua require('blueprints').createFromTemplateTelesco
|
|||||||
|
|
||||||
---- Git ----
|
---- Git ----
|
||||||
map("n", "<leader>gb", "<CMD>Gitsigns blame<CR>", { desc = "Git blame" })
|
map("n", "<leader>gb", "<CMD>Gitsigns blame<CR>", { desc = "Git blame" })
|
||||||
|
map("n", "<leader>ghr", "<CMD>Gitsigns reset_hunk<CR>", { desc = "Git next change" })
|
||||||
|
map("n", "<leader>gha", "<CMD>Gitsigns stage_hunk<CR>", { desc = "Git next change" })
|
||||||
map("n", "]g", "<CMD>Gitsigns next_hunk<CR>", { desc = "Git next change" })
|
map("n", "]g", "<CMD>Gitsigns next_hunk<CR>", { desc = "Git next change" })
|
||||||
map("n", "[g", "<CMD>Gitsigns prev_hunk<CR>", { desc = "Git prev change" })
|
map("n", "[g", "<CMD>Gitsigns prev_hunk<CR>", { desc = "Git prev change" })
|
||||||
map("n", "<leader>gdo", "<CMD>DiffviewOpen<CR>", { desc = "Git diff view open" })
|
map("n", "<leader>gdo", "<CMD>DiffviewOpen<CR>", { desc = "Git diff view open" })
|
||||||
@@ -339,9 +341,12 @@ map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit All" })
|
|||||||
---- Utils ----
|
---- Utils ----
|
||||||
|
|
||||||
-- undotree
|
-- undotree
|
||||||
map("n", "<leader>ut", "<cmd>UndotreeToggle<cr>", { desc = "Toggle undotree" })
|
map("n", "<leader>tu", "<cmd>UndotreeToggle<cr>", { desc = "Toggle undotree" })
|
||||||
|
|
||||||
-- aerial
|
-- aerial
|
||||||
map("n", "<leader>a", "<cmd>AerialToggle<cr>", { desc = "Toggle aerial view" })
|
map("n", "<leader>a", "<cmd>AerialToggle<cr>", { desc = "Toggle aerial view" })
|
||||||
map("n", "]a", "<cmd>AerialNext<cr>", { desc = "Next aerial view" })
|
map("n", "]a", "<cmd>AerialNext<cr>", { desc = "Next aerial view" })
|
||||||
map("n", "[a", "<cmd>AerialPrev<cr>", { desc = "Prev aerial view" })
|
map("n", "[a", "<cmd>AerialPrev<cr>", { desc = "Prev aerial view" })
|
||||||
|
|
||||||
|
-- colorizer
|
||||||
|
map("n", "tc", "<cmd>ColorizerToggle<cr>", { desc = "Toggle Colorizer" })
|
||||||
|
|||||||
@@ -1,57 +1,3 @@
|
|||||||
return {
|
return {
|
||||||
{
|
-- multiple cursors and stuff like that, not supported yet
|
||||||
"brenton-leighton/multiple-cursors.nvim",
|
|
||||||
version = "*", -- Use the latest tagged version
|
|
||||||
opts = {}, -- This causes the plugin setup function to be called
|
|
||||||
keys = {
|
|
||||||
{ "<C-j>", "<Cmd>MultipleCursorsAddDown<CR>", mode = { "n", "x" }, desc = "Add cursor and move down" },
|
|
||||||
{ "<C-k>", "<Cmd>MultipleCursorsAddUp<CR>", mode = { "n", "x" }, desc = "Add cursor and move up" },
|
|
||||||
|
|
||||||
{ "<C-Up>", "<Cmd>MultipleCursorsAddUp<CR>", mode = { "n", "i", "x" }, desc = "Add cursor and move up" },
|
|
||||||
{
|
|
||||||
"<C-Down>",
|
|
||||||
"<Cmd>MultipleCursorsAddDown<CR>",
|
|
||||||
mode = { "n", "i", "x" },
|
|
||||||
desc = "Add cursor and move down",
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"<C-LeftMouse>",
|
|
||||||
"<Cmd>MultipleCursorsMouseAddDelete<CR>",
|
|
||||||
mode = { "n", "i" },
|
|
||||||
desc = "Add or remove cursor on mouse click",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"<C-Return>",
|
|
||||||
"<Cmd>MultipleCursorsAddDelete<CR>",
|
|
||||||
mode = { "n" },
|
|
||||||
desc = "Add a locked cursor or remove an existing cursor",
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"<Leader>m",
|
|
||||||
"<Cmd>MultipleCursorsAddVisualArea<CR>",
|
|
||||||
mode = { "x" },
|
|
||||||
desc = "Add cursors to the lines of the visual area",
|
|
||||||
},
|
|
||||||
|
|
||||||
{ "<Leader>a", "<Cmd>MultipleCursorsAddMatches<CR>", mode = { "n", "x" }, desc = "Add cursors to cword" },
|
|
||||||
{
|
|
||||||
"<Leader>A",
|
|
||||||
"<Cmd>MultipleCursorsAddMatchesV<CR>",
|
|
||||||
mode = { "n", "x" },
|
|
||||||
desc = "Add cursors to cword in previous area",
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"<Leader>d",
|
|
||||||
"<Cmd>MultipleCursorsAddJumpNextMatch<CR>",
|
|
||||||
mode = { "n", "x" },
|
|
||||||
desc = "Add cursor and jump to next cword",
|
|
||||||
},
|
|
||||||
{ "<Leader>D", "<Cmd>MultipleCursorsJumpNextMatch<CR>", mode = { "n", "x" }, desc = "Jump to next cword" },
|
|
||||||
|
|
||||||
{ "<Leader>l", "<Cmd>MultipleCursorsLock<CR>", mode = { "n", "x" }, desc = "Lock virtual cursors" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,11 +9,6 @@ return {
|
|||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
|
||||||
"sindrets/diffview.nvim",
|
|
||||||
lazy = false,
|
|
||||||
},
|
|
||||||
|
|
||||||
{ "tpope/vim-fugitive" },
|
{ "tpope/vim-fugitive" },
|
||||||
|
|
||||||
-- {
|
-- {
|
||||||
|
|||||||
@@ -1,83 +0,0 @@
|
|||||||
local cmp = require("cmp")
|
|
||||||
|
|
||||||
local function border(hl_name)
|
|
||||||
return {
|
|
||||||
{ "╭", hl_name },
|
|
||||||
{ "─", hl_name },
|
|
||||||
{ "╮", hl_name },
|
|
||||||
{ "│", hl_name },
|
|
||||||
{ "╯", hl_name },
|
|
||||||
{ "─", hl_name },
|
|
||||||
{ "╰", hl_name },
|
|
||||||
{ "│", hl_name },
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
local options = {
|
|
||||||
completion = {
|
|
||||||
completeopt = "menu,menuone",
|
|
||||||
},
|
|
||||||
|
|
||||||
window = {
|
|
||||||
completion = {
|
|
||||||
side_padding = 1,
|
|
||||||
scrollbar = false,
|
|
||||||
},
|
|
||||||
documentation = {
|
|
||||||
border = border("CmpDocBorder"),
|
|
||||||
winhighlight = "Normal:CmpDoc",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
snippet = {
|
|
||||||
expand = function(args)
|
|
||||||
require("luasnip").lsp_expand(args.body)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
preselect = cmp.PreselectMode.None,
|
|
||||||
mapping = {
|
|
||||||
["<C-p>"] = cmp.mapping.select_prev_item(),
|
|
||||||
["<C-n>"] = cmp.mapping.select_next_item(),
|
|
||||||
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
|
||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
|
||||||
["<C-e>"] = cmp.mapping.close(),
|
|
||||||
["<CR>"] = cmp.mapping.confirm({
|
|
||||||
behavior = cmp.ConfirmBehavior.Insert,
|
|
||||||
select = true,
|
|
||||||
}),
|
|
||||||
["<Tab>"] = cmp.mapping(function(fallback)
|
|
||||||
if cmp.visible() then
|
|
||||||
cmp.select_next_item()
|
|
||||||
elseif require("luasnip").expand_or_jumpable() then
|
|
||||||
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "")
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end, {
|
|
||||||
"i",
|
|
||||||
"s",
|
|
||||||
}),
|
|
||||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
|
||||||
if cmp.visible() then
|
|
||||||
cmp.select_prev_item()
|
|
||||||
elseif require("luasnip").jumpable(-1) then
|
|
||||||
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true), "")
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end, {
|
|
||||||
"i",
|
|
||||||
"s",
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
sources = {
|
|
||||||
{ name = "nvim_lsp" },
|
|
||||||
{ name = "luasnip" },
|
|
||||||
{ name = "buffer" },
|
|
||||||
{ name = "nvim_lua" },
|
|
||||||
{ name = "path" },
|
|
||||||
{ name = "emoji" },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
return options
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
local config = {
|
|
||||||
views = {
|
|
||||||
cmdline_popup = {
|
|
||||||
position = {
|
|
||||||
row = 3,
|
|
||||||
col = "50%",
|
|
||||||
},
|
|
||||||
size = {
|
|
||||||
width = 60,
|
|
||||||
height = "auto",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
cmdline_popupmenu = {
|
|
||||||
position = {
|
|
||||||
row = 6,
|
|
||||||
col = "50%",
|
|
||||||
},
|
|
||||||
size = {
|
|
||||||
width = 60,
|
|
||||||
height = "auto",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
cmdline = {
|
|
||||||
enabled = true,
|
|
||||||
view = "cmdline", -- cmdline, cmdline_popup
|
|
||||||
opts = {},
|
|
||||||
---@type table<string, CmdlineFormat>
|
|
||||||
format = {
|
|
||||||
cmdline = { pattern = "^:", icon = "λ", lang = "vim", title = "" },
|
|
||||||
search_down = { kind = "search", pattern = "^/", icon = " ", lang = "regex" },
|
|
||||||
search_up = { kind = "search", pattern = "^%?", icon = " ", lang = "regex" },
|
|
||||||
filter = { pattern = "^:%s*!", icon = "$", lang = "bash" },
|
|
||||||
lua = {
|
|
||||||
pattern = { "^:%s*lua%s+", "^:%s*lua%s*=%s*", "^:%s*=%s*" },
|
|
||||||
icon = "",
|
|
||||||
lang = "lua",
|
|
||||||
},
|
|
||||||
help = { pattern = "^:%s*he?l?p?%s+", icon = "" },
|
|
||||||
input = {}, -- Used by input()
|
|
||||||
-- lua = false, -- to disable a format, set to `false`
|
|
||||||
},
|
|
||||||
},
|
|
||||||
notify = {
|
|
||||||
-- Noice can be used as `vim.notify` so you can route any notification like other messages
|
|
||||||
-- Notification messages have their level and other properties set.
|
|
||||||
-- event is always "notify" and kind can be any log level as a string
|
|
||||||
-- The default routes will forward notifications to nvim-notify
|
|
||||||
-- Benefit of using Noice for this is the routing and consistent history view
|
|
||||||
enabled = false,
|
|
||||||
view = "notify",
|
|
||||||
},
|
|
||||||
lsp = {
|
|
||||||
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
|
|
||||||
override = {
|
|
||||||
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
|
|
||||||
["vim.lsp.util.stylize_markdown"] = true,
|
|
||||||
["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
|
|
||||||
},
|
|
||||||
},
|
|
||||||
presets = {
|
|
||||||
bottom_search = true, -- use a classic bottom cmdline for search
|
|
||||||
command_palette = true, -- position the cmdline and popupmenu together
|
|
||||||
long_message_to_split = true, -- long messages will be sent to a split
|
|
||||||
inc_rename = false, -- enables an input dialog for inc-rename.nvim
|
|
||||||
lsp_doc_border = false, -- add a border to hover docs and signature help
|
|
||||||
},
|
|
||||||
routes = {
|
|
||||||
{ view = "cmdline", filter = { event = "msg_showmode" } },
|
|
||||||
{
|
|
||||||
filter = {
|
|
||||||
event = "msg_show",
|
|
||||||
kind = "",
|
|
||||||
find = "written",
|
|
||||||
},
|
|
||||||
opts = { skip = true },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
return config
|
|
||||||
@@ -3,7 +3,7 @@ return {
|
|||||||
"NvChad/nvim-colorizer.lua",
|
"NvChad/nvim-colorizer.lua",
|
||||||
config = function()
|
config = function()
|
||||||
require("colorizer").setup({
|
require("colorizer").setup({
|
||||||
filetypes = { "css", "javascript", html = { mode = "foreground" }, "astro", "vue", "scss" },
|
filetypes = { "css", "javascript", html = { mode = "foreground" }, "astro", "vue", "scss", "text" },
|
||||||
user_default_options = {
|
user_default_options = {
|
||||||
RGB = true, -- #RGB hex codes
|
RGB = true, -- #RGB hex codes
|
||||||
RRGGBB = true, -- #RRGGBB hex codes
|
RRGGBB = true, -- #RRGGBB hex codes
|
||||||
|
|||||||
@@ -43,6 +43,8 @@ local config = {
|
|||||||
words = { enabled = true },
|
words = { enabled = true },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
-- Task runner
|
||||||
|
-- TODO: think if really necessary
|
||||||
{
|
{
|
||||||
"stevearc/overseer.nvim",
|
"stevearc/overseer.nvim",
|
||||||
opts = {},
|
opts = {},
|
||||||
|
|||||||
@@ -2,14 +2,14 @@
|
|||||||
-- │ Styling │
|
-- │ Styling │
|
||||||
-- ╰─────────╯
|
-- ╰─────────╯
|
||||||
return {
|
return {
|
||||||
{
|
-- {
|
||||||
dir = "~/Documents/Code/plain-colors.nvim",
|
-- dir = "~/Documents/Code/plain-colors.nvim",
|
||||||
-- "rose-pine/neovim",
|
-- -- "rose-pine/neovim",
|
||||||
name = "rose-pine",
|
-- name = "rose-pine",
|
||||||
opts = {
|
-- opts = {
|
||||||
variant = "darker", -- dark, light, darker | dawn
|
-- variant = "darker", -- dark, light, darker | dawn
|
||||||
},
|
-- },
|
||||||
},
|
-- },
|
||||||
{
|
{
|
||||||
"dqnid/komau.vim",
|
"dqnid/komau.vim",
|
||||||
-- dir = "~/Documents/Code/komau.vim",
|
-- dir = "~/Documents/Code/komau.vim",
|
||||||
@@ -67,21 +67,6 @@ return {
|
|||||||
|
|
||||||
{ "echasnovski/mini.icons" },
|
{ "echasnovski/mini.icons" },
|
||||||
|
|
||||||
{
|
|
||||||
"folke/noice.nvim",
|
|
||||||
event = "VeryLazy",
|
|
||||||
opts = function()
|
|
||||||
return require("plugins.opts.noice")
|
|
||||||
end,
|
|
||||||
dependencies = {
|
|
||||||
"MunifTanjim/nui.nvim",
|
|
||||||
-- OPTIONAL:
|
|
||||||
-- `nvim-notify` is only needed, if you want to use the notification view.
|
|
||||||
-- If not available, we use `mini` as the fallback
|
|
||||||
-- "rcarriga/nvim-notify",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"shortcuts/no-neck-pain.nvim",
|
"shortcuts/no-neck-pain.nvim",
|
||||||
version = "*",
|
version = "*",
|
||||||
|
|||||||
Reference in New Issue
Block a user