cleanup and remove unused plugins

This commit is contained in:
xesc 2025-06-22 21:37:43 +02:00
parent a98c41f65b
commit c815f1f513
10 changed files with 127 additions and 286 deletions

View file

@ -2,31 +2,69 @@
-- Disable autocommenting on new lines under commented ones
vim.api.nvim_create_autocmd("Filetype", {
pattern = "*",
command = "setlocal formatoptions-=c formatoptions-=r formatoptions-=o"
local augroup = vim.api.nvim_create_augroup
local autocmd = vim.api.nvim_create_autocmd
local custom_augroup = augroup('custom_augroup', {})
autocmd("Filetype", {
pattern = "*",
command = "setlocal formatoptions-=c formatoptions-=r formatoptions-=o"
})
-- persistent folds
vim.api.nvim_create_autocmd({"BufWinLeave"}, {
pattern = {"*.*"},
autocmd({ "BufWinLeave" }, {
group = custom_augroup,
pattern = { "*.*" },
desc = "save view (folds), when closing file",
command = "mkview",
})
vim.api.nvim_create_autocmd({"BufWinEnter"}, {
pattern = {"*.*"},
autocmd({ "BufWinEnter" }, {
group = custom_augroup,
pattern = { "*.*" },
desc = "load view (folds), when opening file",
command = "silent! loadview"
})
vim.api.nvim_create_autocmd("WinEnter", {
callback = function()
vim.wo.cursorline = true
end,
autocmd("WinEnter", {
group = custom_augroup,
callback = function()
vim.wo.cursorline = true
end,
})
vim.api.nvim_create_autocmd("WinLeave", {
callback = function()
vim.wo.cursorline = false
end,
autocmd("WinLeave", {
group = custom_augroup,
callback = function()
vim.wo.cursorline = false
end,
})
-- remove trailing whitespace
autocmd({"BufWritePre"}, {
group = custom_augroup,
pattern = "*",
command = [[%s/\s\+$//e]],
})
autocmd("LspAttach", {
group = custom_augroup,
callback = function(e)
-- keymaps --
local opts = { buffer = e.buf }
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
vim.keymap.set('n', 'K', function() vim.lsp.buf.hover { border = "rounded" } end, opts)
vim.keymap.set('n', '<space>cl', "<cmd>LspInfo<cr>", opts)
vim.keymap.set('n', '<space>cd', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
vim.keymap.set('n', '<space>gr', vim.lsp.buf.references, opts)
vim.keymap.set('n', '<space>cf', function() vim.lsp.buf.format { async = true } end, opts)
vim.keymap.set('v', '<space>cf', function() vim.lsp.buf.format { async = true } end, opts)
vim.keymap.set("n", "<leader>ws", function() vim.lsp.buf.workspace_symbol() end, opts)
vim.keymap.set("i", "<C-s>", function() vim.lsp.buf.signature_help { border = "rounded" } end, opts)
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, opts)
vim.keymap.set("n", "<leader>cw", function() vim.lsp.buf.rename() end, opts)
end,
})

View file

@ -22,6 +22,10 @@ vim.api.nvim_set_keymap("n", "<leader>bd", "<cmd>bd<cr>", {})
vim.api.nvim_set_keymap("n", "<leader>bn", "<cmd>bnext<cr>", {})
vim.api.nvim_set_keymap("n", "<leader>bp", "<cmd>bprevious<cr>", {})
-- quickfix operations
vim.api.nvim_set_keymap("n", "<leader>qc", "<cmd>ccl<cr>", {})
vim.api.nvim_set_keymap("n", "<leader>qw", "<cmd>cw<cr>", {})
-- moving visual blocks
vim.api.nvim_set_keymap("v", "J", ":m '>+1<cr>gv=gv", {})
vim.api.nvim_set_keymap("v", "K", ":m '<-2<cr>gv=gv", {})
@ -55,11 +59,15 @@ vim.api.nvim_set_keymap("n", "<leader>XX", ":qa!<cr>", {})
vim.api.nvim_set_keymap("n", "<leader>XZZ", ":wqa!<cr>", {})
vim.api.nvim_set_keymap("n", "<leader>x", ":q<cr>", {})
-- fast editing
vim.api.nvim_set_keymap("n", "<leader>E", ":e ", {})
-- vertical resize
vim.api.nvim_set_keymap("n", "<leader>vr", ":vertical-resize ", {})
-- fast Todo and way to notes
vim.api.nvim_set_keymap("n", "<leader>N", ":e ~/notes/Todo.md<cr>", {})
vim.cmd([[
function! CenterPane()
lefta vnew
wincmd w
exec 'vertical resize '. string(&columns * 0.75)
endfunction
]])
vim.api.nvim_set_keymap("n", "<leader>C", ":call CenterPane()<cr>", {})

View file

@ -61,11 +61,8 @@ vim.api.nvim_set_option("splitright",true)
-- disable Netrw-Banner
vim.g.netrw_banner = 0
-- disable Netrw for Filetree Plugin
vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1
vim.g.netrw_browse_split = 0
vim.g.netrw_winsize = 25
-- undotree file management
vim.opt.swapfile = false

View file

@ -1,15 +0,0 @@
return {
{
"matze/wastebin.nvim",
config = function()
require("wastebin").setup({
url = "https://bin.xesc.de",
open_cmd = "xdg-open"
})
end,
opts = {
vim.keymap.set("n", "<leader>wp", "<cmd>WastePaste<cr>", { silent = true }),
vim.keymap.set("v", "<leader>wp", "<cmd>WastePaste<cr>", { silent = true }),
},
}
}

View file

@ -1,8 +1,5 @@
return {
{
"echasnovski/mini.comment",
config = function()
require("mini.comment").setup()
end,
},
{
'tpope/vim-commentary'
},
}

View file

@ -1,64 +0,0 @@
return {
{
"sainnhe/gruvbox-material",
lazy = true,
config = function()
-- Settings for colorscheme
vim.api.nvim_set_var("gruvbox_material_background", "hard")
vim.api.nvim_set_var("gruvbox_material_transparent_background", "1")
vim.api.nvim_set_var("gruvbox_material_ui_contrast", "low")
vim.api.nvim_set_var("gruvbox_material_show_eob", "0")
vim.api.nvim_set_var("gruvbox_material_enable_bold", "1")
vim.api.nvim_set_var("gruvbox_material_enable_italic", "1")
vim.api.nvim_set_var("gruvbox_material_better_performance", "1")
vim.cmd([[colo gruvbox-material]])
-- Settings to override colorscheme
-- vim.api.nvim_set_hl(0, "ModeMsg", { bold = true, fg = "#d8a657"})
-- colors of tabline
vim.api.nvim_set_hl(0, "TabLine", { bg = "#3c3836", fg = "#89b482" })
vim.api.nvim_set_hl(0, "TabLineFil", { bg = "#1d2021" })
vim.api.nvim_set_hl(0, "TabLineSel", { bold = true, bg = "none", fg = "#d8a657" })
-- color of statusline
vim.api.nvim_set_hl(0, "StatusLine", { bold = false, bg = "#1d2021", fg = "#89b482" })
vim.api.nvim_set_hl(0, "StatusLineNC", { bg = "#1d2021", fg = "#5b534d" })
-- color of vertical split line
vim.api.nvim_set_hl(0, "VertSplit", { bg = "#141617", fg = "#141617" })
-- color of the cursorline and cursorlinenumber
vim.api.nvim_set_hl(0, "Cursorline", { bg = "#141617" })
vim.api.nvim_set_hl(0, "CursorLineNr", { bold = true, bg = "#141617", fg = "#d8a657" })
-- color of Floats and FloatBorders
vim.api.nvim_set_hl(0, "NormalFloat", { bg = none, fg = none })
vim.api.nvim_set_hl(0, "FloatBorder", { bg = none, fg = "#d4be98" })
vim.api.nvim_set_hl(0, "DiagnosticFloatingWarn", { bg = none, fg = "#d8a657" })
vim.api.nvim_set_hl(0, "DiagnosticFloatingError", { bg = none, fg = "#ea6962" })
vim.api.nvim_set_hl(0, "DiagnosticFloatingHint", { bg = none, fg = "#a9b665" })
vim.api.nvim_set_hl(0, "DiagnosticFloatingInfo", { bg = none, fg = "#d4be98" })
-- autocommand for overrides
vim.api.nvim_create_autocmd("ColorScheme", {
pattern = "gruvbox-material",
callback = function()
vim.api.nvim_set_hl(0, "TabLine", { bg = "#3c3836", fg = "#89b482" })
vim.api.nvim_set_hl(0, "TabLineFil", { bg = "#1d2021" })
vim.api.nvim_set_hl(0, "TabLineSel", { bold = true, bg = "none", fg = "#d8a657" })
-- color of statusline
vim.api.nvim_set_hl(0, "StatusLine", { bold = false, bg = "#1d2021", fg = "#89b482" })
vim.api.nvim_set_hl(0, "StatusLineNC", { bg = "#1d2021", fg = "#5b534d" })
-- color of vertical split line
vim.api.nvim_set_hl(0, "VertSplit", { bg = "#141617", fg = "#141617" })
-- color of the cursorline and cursorlinenumber
vim.api.nvim_set_hl(0, "Cursorline", { bg = "#141617" })
vim.api.nvim_set_hl(0, "CursorLineNr", { bold = true, bg = "#141617", fg = "#d8a657" })
-- color of Floats and FloatBorders
vim.api.nvim_set_hl(0, "NormalFloat", { bg = none, fg = none })
vim.api.nvim_set_hl(0, "FloatBorder", { bg = none, fg = "#d4be98" })
vim.api.nvim_set_hl(0, "DiagnosticFloatingWarn", { bg = none, fg = "#d8a657" })
vim.api.nvim_set_hl(0, "DiagnosticFloatingError", { bg = none, fg = "#ea6962" })
vim.api.nvim_set_hl(0, "DiagnosticFloatingHint", { bg = none, fg = "#a9b665" })
vim.api.nvim_set_hl(0, "DiagnosticFloatingInfo", { bg = none, fg = "#d4be98" })
end,
})
end,
},
}

View file

@ -13,7 +13,6 @@ return {
"saadparwaiz1/cmp_luasnip",
"nvim-telescope/telescope-ui-select.nvim",
"nvimtools/none-ls.nvim",
"nvimdev/lspsaga.nvim",
'nvim-treesitter/nvim-treesitter',
'nvim-tree/nvim-web-devicons',
"jay-babu/mason-null-ls.nvim",
@ -209,9 +208,6 @@ return {
require("telescope").setup {
extensions = {
["ui-select"] = {
-- require("telescope.themes").get_dropdown {
-- -- even more opts
-- }
}
}
}
@ -242,64 +238,6 @@ return {
ensure_installed = { "clang_format", "shellharden", "shfmt" }
})
-- lspsaga (pretty lsp-windows)
require('lspsaga').setup({
symbol_in_winbar = {
enable = false,
show_file = false
},
finder = {
keys = {
toggle_or_open = "<cr>",
quit = { '<Esc>', 'q' }
}
},
outline = {
win_position = 'right',
win_width = 32,
auto_preview = true,
},
lightbulb = {
enable = false
},
ui = {
code_action = '',
title = true,
border = 'rounded',
},
rename = {
in_select = false,
keys = {
quit = { '<Esc>', 'q' },
select = '<Space>'
}
},
hover_doc = {
open_cmd = '!firefox'
},
code_action = {
keys = {
quit = { '<Esc>', 'q' }
},
extend_gitsigns = false,
},
definition = {
keys = {
quit = { '<Esc>', 'q' },
},
},
diagnostic = {
border_follow = true,
extend_relatedInformation = true,
keys = {
quit = { '<Esc>', 'q' },
quit_in_show = { '<Esc>', 'q' },
}
}
})
-- config --
vim.diagnostic.config({
@ -318,29 +256,6 @@ return {
},
})
-- keymaps --
local opts = { noremap = true, silent = true }
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
vim.keymap.set('n', 'K', function() vim.lsp.buf.hover { border = "rounded" } end, opts)
vim.keymap.set('n', '<leader>k', function() vim.lsp.buf.hover { border = "rounded" } end, opts)
vim.keymap.set('n', '<space>cl', "<cmd>LspInfo<cr>", opts)
vim.keymap.set('n', '<space>cd', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '[n', vim.diagnostic.goto_prev, opts)
vim.keymap.set('n', ']n', vim.diagnostic.goto_next, opts)
vim.keymap.set('n', '<space>gr', vim.lsp.buf.references, opts)
vim.keymap.set('n', '<space>cf', function() vim.lsp.buf.format { async = true } end, opts)
vim.keymap.set('v', '<space>cf', function() vim.lsp.buf.format { async = true } end, opts)
vim.keymap.set("n", "<leader>fws", function() vim.lsp.buf.workspace_symbol() end, opts)
vim.keymap.set("i", "<C-s>", function() vim.lsp.buf.signature_help { border = "rounded" } end, opts)
vim.keymap.set('n', '<C-n>', "<cmd>Lspsaga term_toggle<cr>", opts)
vim.keymap.set('t', '<C-n>', "<cmd>Lspsaga term_toggle<cr>", opts)
vim.keymap.set('n', '<space>so', '<cmd>Lspsaga outline<cr>', opts)
vim.keymap.set('n', '<space>sf', '<cmd>Lspsaga finder<cr>', opts)
vim.keymap.set('n', '<space>sd', '<cmd>Lspsaga peek_definition<cr>', opts)
vim.keymap.set('n', '<space>cw', "<cmd>Lspsaga rename mode=n<cr>", opts)
vim.keymap.set('n', '<space>cA', vim.lsp.buf.code_action, opts)
vim.keymap.set('n', '<space>ca', '<cmd>Lspsaga code_action<cr>', opts)
end,
}
}

View file

@ -1,18 +0,0 @@
return {
"nvim-tree/nvim-tree.lua",
version = "*",
lazy = false,
dependencies = {
"nvim-tree/nvim-web-devicons",
},
keys = {
{ "<leader>F", "<cmd>NvimTreeFindFileToggle<cr>", desc = "Toggle Filetree" },
},
config = function()
require("nvim-tree").setup({
view = {
width = 56,
},
})
end,
}

View file

@ -1,75 +1,60 @@
return {
{
"nvim-telescope/telescope.nvim",
lazy = true,
cmd = "Telescope",
version = false,
config = function()
require('telescope').setup({
pickers = {
find_files = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
live_grep = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
current_buffer_fuzzy_find = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
grep_string = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
git_files = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
keymaps = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
oldfiles = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
command_history = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
},
})
end,
keys = {
{ "<leader>:", "<cmd>Telescope command_history<cr>", desc = "Command History" },
{ "<leader>,", "<cmd>Telescope buffers show_all_buffers=true<cr>", desc = "Switch Buffer" },
-- find
{ "<leader>ff", "<cmd>Telescope find_files<cr>", desc = "Find Files" },
{ "<leader>fb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Find Strings in current Buffer" },
{ "<leader>fg", "<cmd>Telescope live_grep<cr>", desc = "Grep Content in Files" },
{ "<leader>/", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Find Strings in current Buffer" },
{ "<leader>fh", "<cmd>Telescope grep_string<cr>", desc = "Grep currently hovered String" },
{ "<leader>fG", "<cmd>Telescope git_files<cr>", desc = "Find Git Files" },
{ "<leader>fk", "<cmd>Telescope keymaps<cr>", desc = "List Keymaps" },
{ "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Find Recent Files" },
{
"nvim-telescope/telescope.nvim",
lazy = true,
cmd = "Telescope",
version = false,
config = function()
require('telescope').setup({
pickers = {
find_files = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
live_grep = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
current_buffer_fuzzy_find = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
grep_string = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
git_files = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
keymaps = {
layout_config = {
prompt_position = 'top',
},
sorting_strategy = 'ascending',
},
},
})
end,
keys = {
{ "<leader>,", "<cmd>Telescope buffers show_all_buffers=true<cr>", desc = "Switch Buffer" },
{ "<leader>ff", "<cmd>Telescope find_files<cr>", desc = "Find Files" },
{ "<leader>fb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Find Strings in current Buffer" },
{ "<leader>fg", "<cmd>Telescope live_grep<cr>", desc = "Grep Content in Files" },
{ "<leader>/", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Find Strings in current Buffer" },
{ "<leader>fh", "<cmd>Telescope grep_string<cr>", desc = "Grep currently hovered String" },
{ "<leader>fG", "<cmd>Telescope git_files<cr>", desc = "Find Git Files" },
{ "<leader>fk", "<cmd>Telescope keymaps<cr>", desc = "List Keymaps" },
},
},
}

View file

@ -14,8 +14,6 @@ return {
-- You can use the capture groups defined in textobjects.scm
["af"] = "@function.outer",
["if"] = "@function.inner",
["ap"] = "@parameter.outer",
["ip"] = "@parameter.inner",
["ac"] = "@comment.outer",
["aS"] = "@statement.outer",
["ae"] = "@block.outer",