ivuorinen/dotfiles
1
0
Fork 0
mirror of https://github.com/ivuorinen/dotfiles.git synced 2026-02-03 08:44:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(nvim): plugins cleanup, updates

Browse Source
This commit is contained in:
Ismo Vuorinen
2023-09-05 00:19:20 +03:00
parent 64fc8a13d3
commit 6d8c04977c
16 changed files with 159 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/nvim/lua/plugins/barbecue.lua
View File

@@ -1,11 +1,13 @@
-- Winbar with context.
-- A VS Code like winbar for Neovim
-- https://github.com/utilyre/barbecue.nvim
return {
"utilyre/barbecue.nvim",
dependencies = {
"neovim/nvim-lspconfig",
"SmiteshP/nvim-navic",
"kyazdani42/nvim-web-devicons", -- Optional
"kyazdani42/nvim-web-devicons",
},
version = "*",
config = {
theme = "catppuccin",

4
config/nvim/lua/plugins/gitsigns.lua
View File

@@ -1,4 +1,6 @@
-- Show signs of GIT written in lua
-- Git integration for buffers
-- https://github.com/lewis6991/gitsigns.nvim
-- luacheck: globals vim
return {
"lewis6991/gitsigns.nvim",
dependencies = { "nvim-lua/plenary.nvim" },

21
config/nvim/lua/plugins/lazy.lua
View File

@@ -140,27 +140,6 @@ return {
end,
},
-- Add/change/delete surrounding delimiter pairs with ease.
-- https://github.com/kylechui/nvim-surround
{
--[[
Old text Command New text
------------------------------------------------------------------
surround_words ysiw) (surround_words)
make strings ys$" "make strings"
[delete ar*ound me!] ds] delete around me!
"change quot*es" cs'" "change quotes"
<b>or tag* types</b> csth1<CR> <h1>or tag types</h1>
delete(functi*on calls) dsf function calls
]]
"kylechui/nvim-surround",
version = "*", -- Use for stability; omit to use `main` branch for the latest features
event = "VeryLazy",
config = function()
require("nvim-surround").setup()
end,
},
-- A tree like view for symbols in Neovim using the LSP.
-- https://github.com/simrat39/symbols-outline.nvim
{

6
config/nvim/lua/plugins/mini.lua
View File

@@ -50,7 +50,7 @@ return {
-- Animate common Neovim actions
-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-animate.md
require("mini.animate").setup()
-- require("mini.animate").setup()
-- Go forward/backward with square brackets
-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-bracketed.md
@@ -120,6 +120,10 @@ return {
-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-statusline.md
require("mini.statusline").setup()
-- Fast and feature-rich surround actions
-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-surround.md
require("mini.surround").setup()
-- Minimal and fast tabline showing listed buffers
-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-tabline.md
require("mini.tabline").setup()

107
config/nvim/lua/plugins/neo-tree.lua
View File

@@ -73,7 +73,6 @@ return {
use_popups_for_input = false,
-- use a custom function for sorting files and directories in the tree
sort_function = nil,
event_handlers = {
-- {
-- event = "before_render",
@@ -127,7 +126,6 @@ return {
end,
},
},
default_component_configs = {
container = {
enable_character_fade = true,
@@ -183,57 +181,6 @@ return {
},
},
},
renderers = {
directory = {
{ "indent" },
{ "icon" },
{ "current_filter" },
{
"container",
width = "100%",
right_padding = 0,
--max_width = 60,
content = {
{ "name", zindex = 10 },
-- {
-- "symlink_target",
-- zindex = 10,
-- highlight = "NeoTreeSymbolicLinkTarget",
-- },
{ "clipboard", zindex = 10 },
{ "diagnostics", errors_only = true, zindex = 20, align = "right" },
},
},
},
file = {
{ "indent" },
{ "icon" },
{
"container",
width = "100%",
right_padding = 0,
--max_width = 60,
content = {
{
"name",
use_git_status_colors = false,
zindex = 10,
},
-- {
-- "symlink_target",
-- zindex = 10,
-- highlight = "NeoTreeSymbolicLinkTarget",
-- },
{ "clipboard", zindex = 10 },
{ "bufnr", zindex = 10 },
-- { "harpoon_index" }, --> This is what actually adds the component in where you want it
{ "modified", zindex = 20, align = "right" },
{ "diagnostics", zindex = 20, align = "right" },
{ "git_status", zindex = 20, align = "right" },
},
},
},
},
-- A list of functions, each representing a global custom command
-- that will be available in all sources (if not overridden in `opts[source_name].commands`)
-- see `:h neo-tree-custom-commands-global`
@@ -275,10 +222,10 @@ return {
["<esc>"] = "cancel",
["P"] = { "toggle_preview", config = { use_float = true } },
["l"] = "focus_preview",
["S"] = "open_split",
["s"] = "open_vsplit",
-- ["S"] = "split_with_window_picker",
-- ["s"] = "vsplit_with_window_picker",
-- ["S"] = "open_split",
-- ["s"] = "open_vsplit",
["S"] = "split_with_window_picker",
["s"] = "vsplit_with_window_picker",
["t"] = "open_tabnew",
-- ["<cr>"] = "open_drop",
-- ["t"] = "open_tab_drop",
@@ -344,6 +291,52 @@ return {
end
end,
},
renderers = {
directory = {
{ "indent" },
{ "icon" },
{ "current_filter" },
{
"container",
width = "100%",
right_padding = 0,
--max_width = 60,
content = {
{ "name", zindex = 10 },
{ "clipboard", zindex = 10 },
{ "diagnostics", errors_only = true, zindex = 20, align = "right" },
},
},
},
file = {
{ "indent" },
{ "icon" },
{
"container",
width = "100%",
right_padding = 0,
--max_width = 60,
content = {
{
"name",
use_git_status_colors = false,
zindex = 10,
},
-- {
-- "symlink_target",
-- zindex = 10,
-- highlight = "NeoTreeSymbolicLinkTarget",
-- },
{ "clipboard", zindex = 10 },
{ "bufnr", zindex = 10 },
{ "harpoon_index", zindex = 20, align = "right" },
{ "modified", zindex = 20, align = "right" },
{ "diagnostics", zindex = 20, align = "right" },
{ "git_status", zindex = 20, align = "right" },
},
},
},
},
filtered_items = {
-- when true, they will just be displayed differently than normal items
visible = false,

10
config/nvim/lua/plugins/neogen.lua
View File

@@ -14,10 +14,10 @@ return {
},
},
keys = {
{ "<leader>aa", function() require("neogen").generate({ type = "current" }) end, desc = "Current" },
{ "<leader>ac", function() require("neogen").generate({ type = "class" }) end, desc = "Class" },
{ "<leader>af", function() require("neogen").generate({ type = "func" }) end, desc = "Function" },
{ "<leader>at", function() require("neogen").generate({ type = "type" }) end, desc = "Type" },
{ "<leader>aF", function() require("neogen").generate({ type = "file" }) end, desc = "File" },
{ "<leader>baa", function() require("neogen").generate({ type = "current" }) end, desc = "Current" },
{ "<leader>bac", function() require("neogen").generate({ type = "class" }) end, desc = "Class" },
{ "<leader>baf", function() require("neogen").generate({ type = "func" }) end, desc = "Function" },
{ "<leader>bat", function() require("neogen").generate({ type = "type" }) end, desc = "Type" },
{ "<leader>baF", function() require("neogen").generate({ type = "file" }) end, desc = "File" },
},
}

259
config/nvim/lua/plugins/nvim-cmp.lua
View File

@@ -1,259 +0,0 @@
-- luacheck: globals vim
-- Completion menu.
-- Icons to display.
local icons = {
Text = "",
Method = "",
Function = "",
Constructor = "",
Field = " ﰠ ",
Variable = "",
Class = " ﴯ ",
Interface = "",
Module = "",
Property = " ﰠ ",
Unit = " 塞 ",
Value = "",
Enum = "",
Keyword = "",
Snippet = "",
Color = "",
File = "",
Reference = "",
Folder = "",
EnumMember = "",
Constant = "",
Struct = " פּ ",
Event = "",
Operator = "",
TypeParameter = " T ",
Book = "",
}
-- Load loaders from VSCode.
--require("luasnip.loaders.from_vscode").lazy_load({
-- paths = { "~/.local/share/lazy/friendly-snippets" }
--})
return {
"hrsh7th/nvim-cmp",
dependencies = {
{ "octaltree/cmp-look" },
--
{ "hrsh7th/cmp-nvim-lsp" },
--
{ "hrsh7th/cmp-nvim-lua" },
-- Buffer words.
{ "hrsh7th/cmp-buffer" },
-- Path autocompletion.
{ "hrsh7th/cmp-path" },
--
{ "hrsh7th/cmp-cmdline" },
--
{ "saadparwaiz1/cmp_luasnip" },
--
{ "hrsh7th/vim-vsnip" },
--
{ "rafamadriz/friendly-snippets" },
-- Snippets for lua.
{ "L3MON4D3/LuaSnip" }, --config = "luasnip" },
--
{ "hrsh7th/cmp-vsnip" },
--
-- Signature for functions.
--{ 'hrsh7th/cmp-nvim-lsp-signature-help' },
--
{ "hrsh7th/vim-vsnip-integ" },
-- Make arimathetic operations.
{ "hrsh7th/cmp-calc" },
-- Emoji.
{ "hrsh7th/cmp-emoji" },
},
config = function()
local cmp = require("cmp")
local luasnip = require("luasnip")
require("luasnip.loaders.from_vscode").lazy_load()
luasnip.config.setup({})
-- Load specialities from LuaSnip.
-- Set it with VSCode-like mode.
luasnip.config.set_config({
history = true,
updateevents = "TextChanged,TextChangedI",
})
cmp.setup({
-- Window documentation, for defining its dimensions.
window = {
-- Max 10 items on display for documentation.
max_height = 10,
completion = {
side_padding = 0,
col_offset = 1,
},
},
-- Snippet support.
snippet = {
expand = function(args) require("luasnip").lsp_expand(args.body) end,
},
-- How the match works based on the input.
matching = {
-- Whethever we allow fuzzy matching or not.
disallow_fuzzy_matching = false,
},
-- Mapping each keybind.
mapping = {
["<C-n>"] = cmp.mapping.select_next_item(),
["<C-p>"] = cmp.mapping.select_prev_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.Replace,
select = true,
}),
["<Tab>"] = 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,
["<S-Tab>"] = 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,
},
-- Formatting the menu display.
formatting = {
expandable_indicator = true,
fields = { "kind", "abbr", "menu" },
format = function(_, vim_item)
vim_item.menu = vim_item.kind
-- load lspkind icons
--vim_item.kind = string.format(
-- "%s %s",
-- icons[vim_item.kind],
-- vim_item.kind
--)
vim_item.kind = icons[vim_item.kind]
--vim_item.menu = string.format(
-- "%s %s",
-- ({
-- nvim_lsp = "力",
-- nvim_lua = "",
-- luasnip = icons.Color,
-- path = "﫶",
-- buffer = "﬘ ",
-- look = icons.Book,
-- emoji = "😎",
-- })[entry.source.name],
-- name
--)
return vim_item
end,
},
-- Experimental features.
experimental = {
-- It will type a shadow text of the intended completion.
ghost_text = { hl_group = "Comment" },
},
-- Sources for completion, since it is modular; cmp accepts
-- Multiple modules.
sources = {
-- Simple signature, normally outside an object.
--{ name = 'nvim_lsp_signature_help', priority = 15 },
-- More snippets.
-- For all types of languages.
{
name = "friendly-snippets",
priority = 11,
},
-- For the Nvim lua specifics commands.
{
name = "nvim_lua",
priority = 8,
},
-- Support with the current active LSP.
-- Anything that LSP supports and can share with CMP.
{
name = "nvim_lsp",
priority = 11,
max_item_count = 10,
},
-- Snippets in general to facilitate life.
-- Type a often typed methods, like for in C.
-- { name = "luasnip", priority = 6 },
-- Show path based on the backslashes.
-- Type any path, relatively or globally.
{
name = "path",
priority = 9,
},
-- Words from buffer.
{
name = "buffer",
priority = 4,
},
-- Max item count.
-- Dictionary for words.
-- Type any word that is on the /usr/share/dict/words
--{
-- name = 'look',
-- priority = 1,
-- keyword_length = 3,
-- max_item_count = 4,
-- option = {
-- convert_case = true,
-- loud = true,
-- dict = '/usr/share/dict/words'
-- },
--},
-- Emoji.
-- Activate with ":".
{ name = "emoji", priority = 2, option = { insert = true } },
-- Calculate expressions based on the current line.
-- Activate with something like "4 + 5".
{
name = "calc",
priority = 10,
},
},
})
end,
}
-- The line beneath this is called `modeline`. See `:help modeline`
-- vim: ts=2 sts=2 sw=2 et

40
config/nvim/lua/plugins/nvim-dap.lua
View File

@@ -36,25 +36,38 @@ return {
-- Update this to ensure that you have the debuggers for the langs you want
"bash",
"delve",
"jq",
"js",
"lua",
"php",
"python",
"stylua",
},
handlers = {
function(config)
-- all sources with no handler get passed here
-- Keep original functionality
require("mason-nvim-dap").default_setup(config)
end,
},
})
-- Basic debugging keymaps, feel free to change to your liking!
vim.keymap.set("n", "<F5>", dap.continue, { desc = "Debug: Start/Continue" })
vim.keymap.set("n", "<F1>", dap.step_into, { desc = "Debug: Step Into" })
vim.keymap.set("n", "<F2>", dap.step_over, { desc = "Debug: Step Over" })
vim.keymap.set("n", "<F3>", dap.step_out, { desc = "Debug: Step Out" })
vim.keymap.set("n", "<leader>Db", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" })
vim.keymap.set(
"n",
"<leader>DB",
function() dap.set_breakpoint(vim.fn.input("Breakpoint condition: ")) end,
{ desc = "Debug: Set Breakpoint" }
)
local wk = require("which-key")
wk.register({
-- Basic debugging keymaps, feel free to change to your liking!
["<F5>"] = { dap.continue, "Debug: Start/Continue" },
["<F1>"] = { dap.step_into, "Debug: Step Into" },
["<F2>"] = { dap.step_over, "Debug: Step Over" },
["<F3>"] = { dap.step_out, "Debug: Step Out" },
["<leader>Db"] = { dap.toggle_breakpoint, "Debug: Toggle Breakpoint" },
["<leader>DB"] = {
function() dap.set_breakpoint(vim.fn.input("Breakpoint condition: ")) end,
"Debug: Set Breakpoint",
},
-- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
["<F7>"] = { dapui.toggle, "Debug: See last session result." },
}, { prefix = "", mode = "n" })
-- Dap UI setup
-- For more information, see |:help nvim-dap-ui|
@@ -78,9 +91,6 @@ return {
},
})
-- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
vim.keymap.set("n", "<F7>", dapui.toggle, { desc = "Debug: See last session result." })
dap.listeners.after.event_initialized["dapui_config"] = dapui.open
dap.listeners.before.event_terminated["dapui_config"] = dapui.close
dap.listeners.before.event_exited["dapui_config"] = dapui.close

15
config/nvim/lua/plugins/nvim-lspconfig.lua
View File

@@ -1,15 +1,18 @@
-- Quickstart configs for Nvim LSP
-- https://github.com/neovim/nvim-lspconfig
-- luacheck: globals vim
return {
-- LSP auto-complete.
"neovim/nvim-lspconfig",
dependencies = {
-- Automatically install LSPs to stdpath for neovim
{ "williamboman/mason.nvim", config = true },
{ "williamboman/mason.nvim", config = true },
{ "williamboman/mason-lspconfig.nvim" },
-- Useful status updates for LSP
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-- NOTE: using tag legacy, fidget is being re-written completely
{ "j-hui/fidget.nvim", event = "LspAttach", tag = "legacy", opts = {} },
{ "j-hui/fidget.nvim", event = "LspAttach", tag = "legacy", opts = {} },
-- Additional lua configuration, makes nvim stuff amazing!
{ "folke/neodev.nvim" },
@@ -17,9 +20,11 @@ return {
init = function()
-- disable lsp watcher. Too slow on linux
local ok, wf = pcall(require, "vim.lsp._watchfiles")
if ok then wf._watchfunc = function()
return function() end
end end
if ok then
wf._watchfunc = function()
return function() end
end
end
end,
config = function()
-- Switch for controlling whether you want autoformatting.

35
config/nvim/lua/plugins/nvim-treesitter.lua
View File

@@ -20,38 +20,7 @@ return {
modules = {},
-- Add languages to be installed here that you want installed for treesitter
ensure_installed = {
"bash",
"c",
"cmake",
"comment",
"diff",
"dockerfile",
"gitignore",
"go",
"graphql",
"html",
"javascript",
"json",
"json5",
"latex",
"lua",
"markdown",
"php",
"phpdoc",
"python",
"regex",
"scss",
"terraform",
"todotxt",
"toml",
"tsx",
"typescript",
"vim",
"vimdoc",
"vue",
"yaml",
},
ensure_installed = "all",
highlight = {
enable = true,
@@ -129,5 +98,5 @@ return {
enable = true,
mode = "cursor", -- cursor, or topline
},
}
},
}

17
config/nvim/lua/plugins/twilight.lua
View File

@@ -5,14 +5,21 @@ return {
"folke/twilight.nvim",
config = {
dimming = {
alpha = 0.5, -- amount of dimming
inactive = false, -- when true, other windows will be fully dimmed (unless they contain the same buffer)
-- amount of dimming
alpha = 0.2,
-- when true, other windows will be fully dimmed (unless they contain the same buffer)
inactive = false,
},
context = 3, -- amount of lines we will try to show around the current line
treesitter = true, -- use treesitter when available for the filetype
-- amount of lines we will try to show around the current line
context = 3,
-- use treesitter when available for the filetype
-- treesitter is used to automatically expand the visible text,
-- but you can further control the types of nodes that should always be fully expanded
expand = { -- for treesitter, we we always try to expand to the top-most ancestor with these types
treesitter = true,
-- for treesitter, we we always try to expand to the top-most ancestor with these types
expand = {
"function",
"while_statement",
"for_statement",

3
config/nvim/lua/plugins/wilder.lua
View File

@@ -20,8 +20,9 @@ return {
wilder.set_option('renderer', wilder.popupmenu_renderer({
highlights = {
gradient = gradient, -- must be set
-- must be set
-- selected_gradient key can be set to apply gradient highlighting for the selected candidate.
gradient = gradient,
},
highlighter = wilder.highlighter_with_gradient({
wilder.basic_highlighter(), -- or wilder.lua_fzy_highlighter(),