diff --git a/lua/plugin/autopairs.lua b/lua/plugin/autopairs.lua index f101fbd..693cfc5 100644 --- a/lua/plugin/autopairs.lua +++ b/lua/plugin/autopairs.lua @@ -1,10 +1,10 @@ return { - { - "echasnovski/mini.pairs", - event = "VeryLazy", - version = false, - config = function() - require("mini.pairs").setup() - end, - } + { + "echasnovski/mini.pairs", + event = "VeryLazy", + version = false, + config = function() + require("mini.pairs").setup() + end, + } } diff --git a/lua/plugin/bin.lua b/lua/plugin/bin.lua index 94cc945..26b7b0f 100644 --- a/lua/plugin/bin.lua +++ b/lua/plugin/bin.lua @@ -1,15 +1,15 @@ return { - { - "matze/wastebin.nvim", - config = function() - require("wastebin").setup({ - url = "https://bin.xesc.de", - open_cmd = "xdg-open" - }) - end, - opts = { - vim.keymap.set("n", "wp", "WastePaste", { silent = true }), - vim.keymap.set("v", "wp", "WastePaste", { silent = true }), - }, - } + { + "matze/wastebin.nvim", + config = function() + require("wastebin").setup({ + url = "https://bin.xesc.de", + open_cmd = "xdg-open" + }) + end, + opts = { + vim.keymap.set("n", "wp", "WastePaste", { silent = true }), + vim.keymap.set("v", "wp", "WastePaste", { silent = true }), + }, + } } diff --git a/lua/plugin/commenting.lua b/lua/plugin/commenting.lua index d68b2cb..d21d817 100644 --- a/lua/plugin/commenting.lua +++ b/lua/plugin/commenting.lua @@ -1,8 +1,8 @@ return { - { - "echasnovski/mini.comment", - config = function() - require("mini.comment").setup() - end, - }, + { + "echasnovski/mini.comment", + config = function() + require("mini.comment").setup() + end, + }, } diff --git a/lua/plugin/devicons.lua b/lua/plugin/devicons.lua index 7b84802..a5b320d 100644 --- a/lua/plugin/devicons.lua +++ b/lua/plugin/devicons.lua @@ -1,4 +1,4 @@ return { - "nvim-tree/nvim-web-devicons", - lazy = true, + "nvim-tree/nvim-web-devicons", + lazy = true, } diff --git a/lua/plugin/everforest.lua b/lua/plugin/everforest.lua index 99ffd55..cb4134b 100644 --- a/lua/plugin/everforest.lua +++ b/lua/plugin/everforest.lua @@ -1,64 +1,64 @@ return { - { - "sainnhe/everforest", - priority = 1000, - config = function() - -- Settings for colorscheme - vim.api.nvim_set_var("everforest_background", "hard") - vim.api.nvim_set_var("everforest_transparent_background", "1") - vim.api.nvim_set_var("everforest_ui_contrast", "low") - vim.api.nvim_set_var("everforest_show_eob", "0") - vim.api.nvim_set_var("everforest_enable_bold", "1") - vim.api.nvim_set_var("everforest_enable_italic", "1") - vim.api.nvim_set_var("everforest_better_performance", "1") - vim.cmd([[colo everforest]]) + { + "sainnhe/everforest", + priority = 1000, + config = function() + -- Settings for colorscheme + vim.api.nvim_set_var("everforest_background", "hard") + vim.api.nvim_set_var("everforest_transparent_background", "1") + vim.api.nvim_set_var("everforest_ui_contrast", "low") + vim.api.nvim_set_var("everforest_show_eob", "0") + vim.api.nvim_set_var("everforest_enable_bold", "1") + vim.api.nvim_set_var("everforest_enable_italic", "1") + vim.api.nvim_set_var("everforest_better_performance", "1") + vim.cmd([[colo everforest]]) - -- 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 = "#272e33", fg = "#dfa000" }) - vim.api.nvim_set_hl(0, "TabLineFil", { bg = "#374145" }) - 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 = "#3a464c" }) - vim.api.nvim_set_hl(0, "CursorLineNr", { bold = true, fg = "#dbbc7f" }) - -- 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 = "#9da9a0" }) - vim.api.nvim_set_hl(0, "DiagnosticFloatingWarn", { bg = none, fg = "#dfa000" }) - vim.api.nvim_set_hl(0, "DiagnosticFloatingError", { bg = none, fg = "#f85552" }) - vim.api.nvim_set_hl(0, "DiagnosticFloatingHint", { bg = none, fg = "#35a77c" }) - vim.api.nvim_set_hl(0, "DiagnosticFloatingInfo", { bg = none, fg = "#8da101" }) + -- 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 = "#272e33", fg = "#dfa000" }) + vim.api.nvim_set_hl(0, "TabLineFil", { bg = "#374145" }) + 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 = "#3a464c" }) + vim.api.nvim_set_hl(0, "CursorLineNr", { bold = true, fg = "#dbbc7f" }) + -- 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 = "#9da9a0" }) + vim.api.nvim_set_hl(0, "DiagnosticFloatingWarn", { bg = none, fg = "#dfa000" }) + vim.api.nvim_set_hl(0, "DiagnosticFloatingError", { bg = none, fg = "#f85552" }) + vim.api.nvim_set_hl(0, "DiagnosticFloatingHint", { bg = none, fg = "#35a77c" }) + vim.api.nvim_set_hl(0, "DiagnosticFloatingInfo", { bg = none, fg = "#8da101" }) - -- autocommand for overrides - vim.api.nvim_create_autocmd("ColorScheme", { - pattern = "everforest", - callback = function() - vim.api.nvim_set_hl(0, "TabLine", { bg = "#272e33", fg = "#dfa000" }) - vim.api.nvim_set_hl(0, "TabLineFil", { bg = "#374145" }) - 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 = "#3c464c" }) - vim.api.nvim_set_hl(0, "CursorLineNr", { bold = true, fg = "#dbbc7f" }) - -- 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 = "#9da9a0" }) - vim.api.nvim_set_hl(0, "DiagnosticFloatingWarn", { bg = none, fg = "#dfa000" }) - vim.api.nvim_set_hl(0, "DiagnosticFloatingError", { bg = none, fg = "#f85552" }) - vim.api.nvim_set_hl(0, "DiagnosticFloatingHint", { bg = none, fg = "#35a77c" }) - vim.api.nvim_set_hl(0, "DiagnosticFloatingInfo", { bg = none, fg = "#8da101" }) + -- autocommand for overrides + vim.api.nvim_create_autocmd("ColorScheme", { + pattern = "everforest", + callback = function() + vim.api.nvim_set_hl(0, "TabLine", { bg = "#272e33", fg = "#dfa000" }) + vim.api.nvim_set_hl(0, "TabLineFil", { bg = "#374145" }) + 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 = "#3c464c" }) + vim.api.nvim_set_hl(0, "CursorLineNr", { bold = true, fg = "#dbbc7f" }) + -- 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 = "#9da9a0" }) + vim.api.nvim_set_hl(0, "DiagnosticFloatingWarn", { bg = none, fg = "#dfa000" }) + vim.api.nvim_set_hl(0, "DiagnosticFloatingError", { bg = none, fg = "#f85552" }) + vim.api.nvim_set_hl(0, "DiagnosticFloatingHint", { bg = none, fg = "#35a77c" }) + vim.api.nvim_set_hl(0, "DiagnosticFloatingInfo", { bg = none, fg = "#8da101" }) + end, + }) end, - }) - end, - }, + }, } diff --git a/lua/plugin/gitsigns.lua b/lua/plugin/gitsigns.lua index 930471c..338e99d 100644 --- a/lua/plugin/gitsigns.lua +++ b/lua/plugin/gitsigns.lua @@ -1,39 +1,39 @@ return { - { - 'lewis6991/gitsigns.nvim', - event = "VeryLazy", - config = function() - require('gitsigns').setup({ - preview_config = { - border = 'rounded', - }, - on_attach = function(bufnr) - local gs = package.loaded.gitsigns + { + 'lewis6991/gitsigns.nvim', + event = "VeryLazy", + config = function() + require('gitsigns').setup({ + preview_config = { + border = 'rounded', + }, + on_attach = function(bufnr) + local gs = package.loaded.gitsigns - local function map(mode, l, r, opts) - opts = opts or {} - opts.buffer = bufnr - vim.keymap.set(mode, l, r, opts) - end + local function map(mode, l, r, opts) + opts = opts or {} + opts.buffer = bufnr + vim.keymap.set(mode, l, r, opts) + end - -- Navigation - map('n', ']c', function() - if vim.wo.diff then return ']c' end - vim.schedule(function() gs.next_hunk() end) - return '' - end, { expr = true }) + -- Navigation + map('n', ']c', function() + if vim.wo.diff then return ']c' end + vim.schedule(function() gs.next_hunk() end) + return '' + end, { expr = true }) - map('n', '[c', function() - if vim.wo.diff then return '[c' end - vim.schedule(function() gs.prev_hunk() end) - return '' - end, { expr = true }) + map('n', '[c', function() + if vim.wo.diff then return '[c' end + vim.schedule(function() gs.prev_hunk() end) + return '' + end, { expr = true }) - -- Actions - map('n', 'gB', function() gs.blame_line { full = true } end) - map('n', 'gb', gs.toggle_current_line_blame) - end - }) - end, - } + -- Actions + map('n', 'gB', function() gs.blame_line { full = true } end) + map('n', 'gb', gs.toggle_current_line_blame) + end + }) + end, + } } diff --git a/lua/plugin/gruvbox-material.lua b/lua/plugin/gruvbox-material.lua index 81c12a1..00b4076 100644 --- a/lua/plugin/gruvbox-material.lua +++ b/lua/plugin/gruvbox-material.lua @@ -1,64 +1,64 @@ 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]]) + { + "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" }) + -- 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" }) + -- 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, - }) - end, - }, + }, } diff --git a/lua/plugin/harpoon.lua b/lua/plugin/harpoon.lua index f158430..b7d297f 100644 --- a/lua/plugin/harpoon.lua +++ b/lua/plugin/harpoon.lua @@ -1,31 +1,31 @@ return { - { - "ThePrimeagen/harpoon", - branch = "harpoon2", - dependencies = { - "nvim-lua/plenary.nvim", - lazy = true, - }, - config = function() - local harpoon = require("harpoon") - harpoon:setup() + { + "ThePrimeagen/harpoon", + branch = "harpoon2", + dependencies = { + "nvim-lua/plenary.nvim", + lazy = true, + }, + config = function() + local harpoon = require("harpoon") + harpoon:setup() - vim.keymap.set("n", "a", function() harpoon:list():add() end) - vim.keymap.set("n", "", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) + vim.keymap.set("n", "a", function() harpoon:list():add() end) + vim.keymap.set("n", "", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) - vim.keymap.set("n", "n", function() harpoon:list():select(1) end) - vim.keymap.set("n", "e", function() harpoon:list():select(2) end) - vim.keymap.set("n", "i", function() harpoon:list():select(3) end) - vim.keymap.set("n", "o", function() harpoon:list():select(4) end) - vim.keymap.set("n", "1", function() harpoon:list():select(1) end) - vim.keymap.set("n", "2", function() harpoon:list():select(2) end) - vim.keymap.set("n", "3", function() harpoon:list():select(3) end) - vim.keymap.set("n", "4", function() harpoon:list():select(4) end) - vim.keymap.set("n", "5", function() harpoon:list():select(5) end) - vim.keymap.set("n", "6", function() harpoon:list():select(6) end) - vim.keymap.set("n", "7", function() harpoon:list():select(7) end) - vim.keymap.set("n", "8", function() harpoon:list():select(8) end) - vim.keymap.set("n", "9", function() harpoon:list():select(9) end) - end - } + vim.keymap.set("n", "n", function() harpoon:list():select(1) end) + vim.keymap.set("n", "e", function() harpoon:list():select(2) end) + vim.keymap.set("n", "i", function() harpoon:list():select(3) end) + vim.keymap.set("n", "o", function() harpoon:list():select(4) end) + vim.keymap.set("n", "1", function() harpoon:list():select(1) end) + vim.keymap.set("n", "2", function() harpoon:list():select(2) end) + vim.keymap.set("n", "3", function() harpoon:list():select(3) end) + vim.keymap.set("n", "4", function() harpoon:list():select(4) end) + vim.keymap.set("n", "5", function() harpoon:list():select(5) end) + vim.keymap.set("n", "6", function() harpoon:list():select(6) end) + vim.keymap.set("n", "7", function() harpoon:list():select(7) end) + vim.keymap.set("n", "8", function() harpoon:list():select(8) end) + vim.keymap.set("n", "9", function() harpoon:list():select(9) end) + end + } } diff --git a/lua/plugin/indent-blankline.lua b/lua/plugin/indent-blankline.lua index fad971b..9b2a604 100644 --- a/lua/plugin/indent-blankline.lua +++ b/lua/plugin/indent-blankline.lua @@ -1,24 +1,24 @@ return { - { - "lukas-reineke/indent-blankline.nvim", - -- event = "BufReadPre", - main = 'ibl', - config = function() - require("ibl").setup({ - enabled = true, - indent = { - char = "│", - smart_indent_cap = true - }, - whitespace = { - remove_blankline_trail = true, - }, - scope = { - exclude = { - language = { "help", "lazy" } - } - }, - }) - end, - }, + { + "lukas-reineke/indent-blankline.nvim", + -- event = "BufReadPre", + main = 'ibl', + config = function() + require("ibl").setup({ + enabled = true, + indent = { + char = "│", + smart_indent_cap = true + }, + whitespace = { + remove_blankline_trail = true, + }, + scope = { + exclude = { + language = { "help", "lazy" } + } + }, + }) + end, + }, } diff --git a/lua/plugin/lsp.lua b/lua/plugin/lsp.lua index 747b70a..85c5872 100644 --- a/lua/plugin/lsp.lua +++ b/lua/plugin/lsp.lua @@ -18,7 +18,6 @@ return { 'nvim-tree/nvim-web-devicons', }, config = function() - -- setup -- local capabilities = vim.tbl_deep_extend( @@ -83,8 +82,20 @@ return { null_ls.builtins.diagnostics.trail_space.with { disabled_filetypes = { "lua" } }, - null_ls.builtins.code_actions.gitsigns, + null_ls.builtins.code_actions.gitrebase, + null_ls.builtins.diagnostics.checkmake, + null_ls.builtins.diagnostics.cmake_lint, + null_ls.builtins.diagnostics.cppcheck, null_ls.builtins.diagnostics.yamllint, + null_ls.builtins.diagnostics.sqlfluff.with({ + extra_args = { "--dialect", "sqlite" }, + }), + null_ls.builtins.formatting.sqlfluff.with({ + extra_args = { "--dialect", "sqlite" }, + }), + null_ls.builtins.formatting.asmfmt, + null_ls.builtins.formatting.cmake_format, + null_ls.builtins.formatting.yamlfmt, null_ls.builtins.formatting.shfmt, null_ls.builtins.formatting.shellharden, diff --git a/lua/plugin/lualine.lua b/lua/plugin/lualine.lua index 294aa10..055ae24 100644 --- a/lua/plugin/lualine.lua +++ b/lua/plugin/lualine.lua @@ -1,161 +1,161 @@ return { - { - "nvim-lualine/lualine.nvim", - config = function() - vim.api.nvim_set_option("showmode", false) - local custom_gruvbox = require 'lualine.themes.gruvbox-material' - custom_gruvbox.normal.a.bg = '#89b482' - custom_gruvbox.normal.c.bg = '' - custom_gruvbox.insert.a.bg = '#d8a657' - custom_gruvbox.visual.a.bg = '#a9b665' - custom_gruvbox.replace.a.bg = '#ea6962' + { + "nvim-lualine/lualine.nvim", + config = function() + vim.api.nvim_set_option("showmode", false) + local custom_gruvbox = require 'lualine.themes.gruvbox-material' + custom_gruvbox.normal.a.bg = '#89b482' + custom_gruvbox.normal.c.bg = '' + custom_gruvbox.insert.a.bg = '#d8a657' + custom_gruvbox.visual.a.bg = '#a9b665' + custom_gruvbox.replace.a.bg = '#ea6962' - local function lspsaga() - return require('lspsaga.symbol.winbar').get_bar() - end - require('lualine').setup { - options = { - theme = custom_gruvbox, - globalstatus = true, - component_separators = { left = '', right = '' }, - section_separators = { left = '', right = '' }, - disabled_filetypes = { 'netrw', 'Trouble' }, - }, - sections = { - lualine_a = { - { - 'mode', - padding = 1, - } - }, - lualine_b = { - { - 'branch', - icon = '', - color = { fg = '#d8a657', bg = '#141617', gui = 'bold' }, - padding = 1, - }, - { - 'filename', - color = { gui = 'italic', fg = '#d3869b', bg = '#1d2021' }, - padding = 1, - path = 1, - }, - }, - lualine_c = { - { - lspsaga - } - }, - lualine_x = { - { - 'filetype', - color = { bg = '#1d2021', fg = '#d4be98', gui = 'italic' }, - padding = 1, - fmt = function(str) - return (str:gsub("^%l", string.upper)) - end, - }, - { - 'fileformat', - color = { gui = 'italic', bg = '#141617' }, - symbols = { - unix = '(unix)', - dos = '(dos)', - mac = '(mac)', - }, - } + local function lspsaga() + return require('lspsaga.symbol.winbar').get_bar() + end + require('lualine').setup { + options = { + theme = custom_gruvbox, + globalstatus = true, + component_separators = { left = '', right = '' }, + section_separators = { left = '', right = '' }, + disabled_filetypes = { 'netrw', 'Trouble' }, + }, + sections = { + lualine_a = { + { + 'mode', + padding = 1, + } + }, + lualine_b = { + { + 'branch', + icon = '', + color = { fg = '#d8a657', bg = '#141617', gui = 'bold' }, + padding = 1, + }, + { + 'filename', + color = { gui = 'italic', fg = '#d3869b', bg = '#1d2021' }, + padding = 1, + path = 1, + }, + }, + lualine_c = { + { + lspsaga + } + }, + lualine_x = { + { + 'filetype', + color = { bg = '#1d2021', fg = '#d4be98', gui = 'italic' }, + padding = 1, + fmt = function(str) + return (str:gsub("^%l", string.upper)) + end, + }, + { + 'fileformat', + color = { gui = 'italic', bg = '#141617' }, + symbols = { + unix = '(unix)', + dos = '(dos)', + mac = '(mac)', + }, + } - }, - lualine_y = { - { - 'diagnostics', - color = { gui = 'bold', bg = '#141617' }, - sections = { 'error', 'warn', 'info', 'hint' }, - symbols = { error = "✘ ", warn = " ", info = " ", hint = " " }, - padding = 1, - update_in_insert = true - }, - { - 'diff', - icon = { ' ', color = { bg = '#141617', fg = '#d8a657', gui = 'bold' } }, - color = { gui = 'bold', bg = '#141617' }, - padding = 1, - } - }, - lualine_z = { - { - 'location', - padding = 1, - } - } - }, + }, + lualine_y = { + { + 'diagnostics', + color = { gui = 'bold', bg = '#141617' }, + sections = { 'error', 'warn', 'info', 'hint' }, + symbols = { error = "✘ ", warn = " ", info = " ", hint = " " }, + padding = 1, + update_in_insert = true + }, + { + 'diff', + icon = { ' ', color = { bg = '#141617', fg = '#d8a657', gui = 'bold' } }, + color = { gui = 'bold', bg = '#141617' }, + padding = 1, + } + }, + lualine_z = { + { + 'location', + padding = 1, + } + } + }, - inactive_sections = { - lualine_a = { - { - 'mode', - padding = 1, + inactive_sections = { + lualine_a = { + { + 'mode', + padding = 1, + } + }, + lualine_b = { + { + 'branch', + icon = '', + padding = 1, + }, + { + 'filename', + padding = 1, + path = 1, + } + }, + lualine_c = { + }, + lualine_x = { + { + 'filetype', + color = { gui = 'italic' }, + padding = 1, + fmt = function(str) + return (str:gsub("^%l", string.upper)) + end, + }, + { + 'fileformat', + color = { gui = 'italic' }, + symbols = { + unix = 'Unix', + dos = 'Dos', + mac = 'Mac', + }, + }, + }, + lualine_y = { + { + 'diagnostics', + color = { gui = 'bold', bg = '#141617' }, + sections = { 'error', 'warn', 'info', 'hint' }, + symbols = { error = "✘ ", warn = " ", info = " ", hint = "󰌶 " }, + padding = 1, + update_in_insert = true + }, + { + 'diff', + icon = { ' ', color = { bg = '#141617', gui = 'bold' } }, + color = { gui = 'bold', bg = '#141617' }, + padding = 1, + } + }, + lualine_z = { + { + 'location', + padding = 1, + }, + } + }, } - }, - lualine_b = { - { - 'branch', - icon = '', - padding = 1, - }, - { - 'filename', - padding = 1, - path = 1, - } - }, - lualine_c = { - }, - lualine_x = { - { - 'filetype', - color = { gui = 'italic' }, - padding = 1, - fmt = function(str) - return (str:gsub("^%l", string.upper)) - end, - }, - { - 'fileformat', - color = { gui = 'italic' }, - symbols = { - unix = 'Unix', - dos = 'Dos', - mac = 'Mac', - }, - }, - }, - lualine_y = { - { - 'diagnostics', - color = { gui = 'bold', bg = '#141617' }, - sections = { 'error', 'warn', 'info', 'hint' }, - symbols = { error = "✘ ", warn = " ", info = " ", hint = "󰌶 " }, - padding = 1, - update_in_insert = true - }, - { - 'diff', - icon = { ' ', color = { bg = '#141617', gui = 'bold' } }, - color = { gui = 'bold', bg = '#141617' }, - padding = 1, - } - }, - lualine_z = { - { - 'location', - padding = 1, - }, - } - }, - } - end, - }, + end, + }, } diff --git a/lua/plugin/marks.lua b/lua/plugin/marks.lua index 2157ce9..bb23dc8 100644 --- a/lua/plugin/marks.lua +++ b/lua/plugin/marks.lua @@ -1,12 +1,12 @@ return { - { - "chentoast/marks.nvim", - event = "VeryLazy", - opts = {}, - config = function() - require 'marks'.setup({ - sign_priority = 5, - }) - end, - } + { + "chentoast/marks.nvim", + event = "VeryLazy", + opts = {}, + config = function() + require 'marks'.setup({ + sign_priority = 5, + }) + end, + } } diff --git a/lua/plugin/nvimtree.lua b/lua/plugin/nvimtree.lua index 4a75c8a..e35d7b4 100644 --- a/lua/plugin/nvimtree.lua +++ b/lua/plugin/nvimtree.lua @@ -1,18 +1,18 @@ return { - "nvim-tree/nvim-tree.lua", - version = "*", - lazy = false, - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - keys = { - { "F", "NvimTreeFindFileToggle", desc = "Toggle Filetree" }, - }, - config = function() - require("nvim-tree").setup({ - view = { - width = 56, - }, - }) - end, + "nvim-tree/nvim-tree.lua", + version = "*", + lazy = false, + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + keys = { + { "F", "NvimTreeFindFileToggle", desc = "Toggle Filetree" }, + }, + config = function() + require("nvim-tree").setup({ + view = { + width = 56, + }, + }) + end, } diff --git a/lua/plugin/plenary.lua b/lua/plugin/plenary.lua index 46ee96d..0fe75df 100644 --- a/lua/plugin/plenary.lua +++ b/lua/plugin/plenary.lua @@ -1,6 +1,6 @@ return { - { - "nvim-lua/plenary.nvim", - lazy = true, - }, + { + "nvim-lua/plenary.nvim", + lazy = true, + }, } diff --git a/lua/plugin/surround.lua b/lua/plugin/surround.lua index aa80b74..c54b65b 100644 --- a/lua/plugin/surround.lua +++ b/lua/plugin/surround.lua @@ -1,14 +1,14 @@ return { - { - "kylechui/nvim-surround", - version = "*", -- Use for stability; omit to use `main` branch for the latest features - event = "VeryLazy", - config = function() - require("nvim-surround").setup({ - -- Configuration here, or leave empty to use defaults - }) - end - } + { + "kylechui/nvim-surround", + version = "*", -- Use for stability; omit to use `main` branch for the latest features + event = "VeryLazy", + config = function() + require("nvim-surround").setup({ + -- Configuration here, or leave empty to use defaults + }) + end + } } -- Old text Command New text diff --git a/lua/plugin/telescope.lua b/lua/plugin/telescope.lua index 84e8db9..3f7a68c 100644 --- a/lua/plugin/telescope.lua +++ b/lua/plugin/telescope.lua @@ -1,75 +1,75 @@ 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', - }, + { + "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 = { + { ":", "Telescope command_history", desc = "Command History" }, + { ",", "Telescope buffers show_all_buffers=true", desc = "Switch Buffer" }, + -- find + { "ff", "Telescope find_files", desc = "Find Files" }, + { "fb", "Telescope current_buffer_fuzzy_find", desc = "Find Strings in current Buffer" }, + { "fg", "Telescope live_grep", desc = "Grep Content in Files" }, + { "/", "Telescope current_buffer_fuzzy_find", desc = "Find Strings in current Buffer" }, + { "fh", "Telescope grep_string", desc = "Grep currently hovered String" }, + { "fG", "Telescope git_files", desc = "Find Git Files" }, + { "fk", "Telescope keymaps", desc = "List Keymaps" }, + { "fr", "Telescope oldfiles", desc = "Find Recent Files" }, }, - }) - end, - keys = { - { ":", "Telescope command_history", desc = "Command History" }, - { ",", "Telescope buffers show_all_buffers=true", desc = "Switch Buffer" }, - -- find - { "ff", "Telescope find_files", desc = "Find Files" }, - { "fb", "Telescope current_buffer_fuzzy_find", desc = "Find Strings in current Buffer" }, - { "fg", "Telescope live_grep", desc = "Grep Content in Files" }, - { "/", "Telescope current_buffer_fuzzy_find", desc = "Find Strings in current Buffer" }, - { "fh", "Telescope grep_string", desc = "Grep currently hovered String" }, - { "fG", "Telescope git_files", desc = "Find Git Files" }, - { "fk", "Telescope keymaps", desc = "List Keymaps" }, - { "fr", "Telescope oldfiles", desc = "Find Recent Files" }, }, - }, } diff --git a/lua/plugin/treesitter-context.lua b/lua/plugin/treesitter-context.lua index afa8ad1..43d76d5 100644 --- a/lua/plugin/treesitter-context.lua +++ b/lua/plugin/treesitter-context.lua @@ -1,14 +1,14 @@ return { - { - "nvim-treesitter/nvim-treesitter-context", - event = "VeryLazy", - config = function() - require('treesitter-context').setup { - enable = true, - max_lines = 0, - min_window_height = 0, - line_numbers = true, - } - end - } + { + "nvim-treesitter/nvim-treesitter-context", + event = "VeryLazy", + config = function() + require('treesitter-context').setup { + enable = true, + max_lines = 0, + min_window_height = 0, + line_numbers = true, + } + end + } } diff --git a/lua/plugin/treesitter-textobjects.lua b/lua/plugin/treesitter-textobjects.lua index 2040acd..c43422f 100644 --- a/lua/plugin/treesitter-textobjects.lua +++ b/lua/plugin/treesitter-textobjects.lua @@ -1,68 +1,68 @@ return { - { - "nvim-treesitter/nvim-treesitter-textobjects", - dependencies = { "nvim-treesitter/nvim-treesitter" }, - opts = { - textobjects = { - select = { - enable = true, + { + "nvim-treesitter/nvim-treesitter-textobjects", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + opts = { + textobjects = { + select = { + enable = true, - -- Automatically jump forward to textobj, similar to targets.vim - lookahead = true, + -- Automatically jump forward to textobj, similar to targets.vim + lookahead = true, - keymaps = { - -- 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", - ["al"] = "@loop.outer", - ["il"] = "@loop.inner", - ["ar"] = "@return.outer", - ["ir"] = "@return.inner", - ["ia"] = "@assignment.rhs", - ["aa"] = "@assignment.inner", - ["i?"] = "@conditional.inner", - ["a?"] = "@conditional.outer", - ["in"] = "@number.inner", - ["iC"] = "@class.inner", - ["aC"] = "@class.outer", - ["ig"] = "@call.inner", - ["ag"] = "@call.outer", + keymaps = { + -- 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", + ["al"] = "@loop.outer", + ["il"] = "@loop.inner", + ["ar"] = "@return.outer", + ["ir"] = "@return.inner", + ["ia"] = "@assignment.rhs", + ["aa"] = "@assignment.inner", + ["i?"] = "@conditional.inner", + ["a?"] = "@conditional.outer", + ["in"] = "@number.inner", + ["iC"] = "@class.inner", + ["aC"] = "@class.outer", + ["ig"] = "@call.inner", + ["ag"] = "@call.outer", + + -- You can also use captures from other query groups like `locals.scm` + ["as"] = { query = "@scope", query_group = "locals", desc = "Select language scope" }, + }, + -- You can choose the select mode (default is charwise 'v') + -- + -- Can also be a function which gets passed a table with the keys + -- * query_string: eg '@function.inner' + -- * method: eg 'v' or 'o' + -- and should return the mode ('v', 'V', or '') or a table + -- mapping query_strings to modes. + selection_modes = { + ['@parameter.outer'] = 'v', -- charwise + ['@function.outer'] = 'V', -- linewise + }, + -- If you set this to `true` (default is `false`) then any textobject is + -- extended to include preceding or succeeding whitespace. Succeeding + -- whitespace has priority in order to act similarly to eg the built-in + -- `ap`. + -- + -- Can also be a function which gets passed a table with the keys + -- * query_string: eg '@function.inner' + -- * selection_mode: eg 'v' + -- and should return true or false + include_surrounding_whitespace = false, + }, + }, - -- You can also use captures from other query groups like `locals.scm` - ["as"] = { query = "@scope", query_group = "locals", desc = "Select language scope" }, - }, - -- You can choose the select mode (default is charwise 'v') - -- - -- Can also be a function which gets passed a table with the keys - -- * query_string: eg '@function.inner' - -- * method: eg 'v' or 'o' - -- and should return the mode ('v', 'V', or '') or a table - -- mapping query_strings to modes. - selection_modes = { - ['@parameter.outer'] = 'v', -- charwise - ['@function.outer'] = 'V', -- linewise - }, - -- If you set this to `true` (default is `false`) then any textobject is - -- extended to include preceding or succeeding whitespace. Succeeding - -- whitespace has priority in order to act similarly to eg the built-in - -- `ap`. - -- - -- Can also be a function which gets passed a table with the keys - -- * query_string: eg '@function.inner' - -- * selection_mode: eg 'v' - -- and should return true or false - include_surrounding_whitespace = false, }, - }, - - }, - config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) - end, - } + config = function(_, opts) + require("nvim-treesitter.configs").setup(opts) + end, + } } diff --git a/lua/plugin/treesitter.lua b/lua/plugin/treesitter.lua index a0a7947..0b73d09 100644 --- a/lua/plugin/treesitter.lua +++ b/lua/plugin/treesitter.lua @@ -1,32 +1,32 @@ return { - { - "nvim-treesitter/nvim-treesitter", - version = false, - build = ":TSUpdate", - -- event = "BufReadPre", - opts = { - ensure_installed = { - "c", - "lua", - "rust", - "latex", - "bibtex", - "python", - "vim", - "yaml", - "json", - }, - sync_install = false, - auto_install = true, - highlight = { - enable = true, - disable = { - "markdown", + { + "nvim-treesitter/nvim-treesitter", + version = false, + build = ":TSUpdate", + -- event = "BufReadPre", + opts = { + ensure_installed = { + "c", + "lua", + "rust", + "latex", + "bibtex", + "python", + "vim", + "yaml", + "json", + }, + sync_install = false, + auto_install = true, + highlight = { + enable = true, + disable = { + "markdown", + }, + }, }, - }, - }, - config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) - end, - } + config = function(_, opts) + require("nvim-treesitter.configs").setup(opts) + end, + } } diff --git a/lua/plugin/undotree.lua b/lua/plugin/undotree.lua index 6fb2067..418a3fe 100644 --- a/lua/plugin/undotree.lua +++ b/lua/plugin/undotree.lua @@ -1,13 +1,13 @@ return { - { - "mbbill/undotree", - keys = { - { "u", "UndotreeToggle", desc = "toggle undotree" }, - }, - config = function() - vim.g.undotree_WindowLayout = 4 - vim.g.undotree_SplitWidth = 40 - vim.g.undotree_SetFocusWhenToggle = 1 - end - } + { + "mbbill/undotree", + keys = { + { "u", "UndotreeToggle", desc = "toggle undotree" }, + }, + config = function() + vim.g.undotree_WindowLayout = 4 + vim.g.undotree_SplitWidth = 40 + vim.g.undotree_SetFocusWhenToggle = 1 + end + } } diff --git a/lua/plugin/zen.lua b/lua/plugin/zen.lua index 08dcc9e..67281a8 100644 --- a/lua/plugin/zen.lua +++ b/lua/plugin/zen.lua @@ -1,20 +1,20 @@ return { - { - "folke/zen-mode.nvim", - opts = { - window = { - backdrop = 1, - width = 120, - }, - plugins = { - options = { - enabled = true, - showcmd = true, - laststatus = 3, + { + "folke/zen-mode.nvim", + opts = { + window = { + backdrop = 1, + width = 120, + }, + plugins = { + options = { + enabled = true, + showcmd = true, + laststatus = 3, + }, + gitsigns = { enabled = false } + }, + vim.keymap.set("n", "zz", function() require("zen-mode").toggle() end), }, - gitsigns = { enabled = false } - }, - vim.keymap.set("n", "zz", function() require("zen-mode").toggle() end), - }, - } + } }