fix: formatting

This commit is contained in:
Devin Haska 2024-06-05 12:59:50 -07:00
parent c6affee6c1
commit eebbb6c4b7
No known key found for this signature in database
12 changed files with 642 additions and 640 deletions

View file

@ -2,31 +2,31 @@ require("options")
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not vim.loop.fs_stat(lazypath) then if not vim.loop.fs_stat(lazypath) then
vim.fn.system({ vim.fn.system({
"git", "git",
"clone", "clone",
"--filter=blob:none", "--filter=blob:none",
"https://github.com/folke/lazy.nvim.git", "https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release "--branch=stable", -- latest stable release
lazypath, lazypath,
}) })
end end
vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(lazypath)
-- Fix for yanking to system clipboard on Windows -- Fix for yanking to system clipboard on Windows
if vim.fn.has('wsl') == 1 then if vim.fn.has("wsl") == 1 then
vim.g.clipboard = { vim.g.clipboard = {
name = 'WslClipboard', name = "WslClipboard",
copy = { copy = {
['+'] = 'clip.exe', ["+"] = "clip.exe",
['*'] = 'clip.exe', ["*"] = "clip.exe",
}, },
paste = { paste = {
['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', ["+"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', ["*"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
}, },
cache_enabled = 0, cache_enabled = 0,
} }
end end
require("lazy").setup("plugins") require("lazy").setup("plugins")

View file

@ -1,12 +1,12 @@
local function augroup(name) local function augroup(name)
return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) return vim.api.nvim_create_augroup("wf_" .. name, { clear = true })
end end
vim.api.nvim_create_autocmd({ "FileType" }, { vim.api.nvim_create_autocmd({ "FileType" }, {
group = augroup("spellcheck"), group = augroup("spellcheck"),
pattern = { "gitcommit", "markdown", "md", "mdx" }, pattern = { "gitcommit", "markdown", "md", "mdx" },
callback = function() callback = function()
vim.opt_local.spell = true vim.opt_local.spell = true
vim.opt_local.wrap = true vim.opt_local.wrap = true
end, end,
}) })

View file

@ -13,9 +13,9 @@ vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move lines under cursor d
vim.keymap.set("n", "n", "nzzzv", { desc = "Go to next search result and keep cursor centered on screen" }) vim.keymap.set("n", "n", "nzzzv", { desc = "Go to next search result and keep cursor centered on screen" })
vim.keymap.set("n", "N", "Nzzzv", { desc = "Go to previous search result and keep cursor centered on screen" }) vim.keymap.set("n", "N", "Nzzzv", { desc = "Go to previous search result and keep cursor centered on screen" })
vim.keymap.set("x", "<Leader>p", "\"_dP", { desc = "Paste without replacing clipboard contents" }) vim.keymap.set("x", "<Leader>p", '"_dP', { desc = "Paste without replacing clipboard contents" })
vim.keymap.set("n", "<Leader>y", "\"*y", { desc = "Yank into system clipboard" }) vim.keymap.set("n", "<Leader>y", '"*y', { desc = "Yank into system clipboard" })
vim.keymap.set("v", "<Leader>y", "\"*y", { desc = "Yank into system clipboard" }) vim.keymap.set("v", "<Leader>y", '"*y', { desc = "Yank into system clipboard" })
vim.keymap.set("i", "jk", "<Esc>", { desc = "Exit insert mode" }) vim.keymap.set("i", "jk", "<Esc>", { desc = "Exit insert mode" })

View file

@ -31,13 +31,13 @@ vim.opt.hlsearch = false
vim.opt.incsearch = true vim.opt.incsearch = true
vim.opt.fillchars = { vim.opt.fillchars = {
foldopen = "", foldopen = "",
foldclose = "", foldclose = "",
-- fold = "⸱", -- fold = "⸱",
fold = " ", fold = " ",
foldsep = " ", foldsep = " ",
diff = "", diff = "",
eob = " ", eob = " ",
} }
vim.opt.foldlevel = 99 vim.opt.foldlevel = 99

View file

@ -1,100 +1,99 @@
return { return {
{ {
"hrsh7th/nvim-cmp", "hrsh7th/nvim-cmp",
dependencies = { dependencies = {
"hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-buffer", "hrsh7th/cmp-buffer",
}, },
config = function() config = function()
local cmp = require("cmp") local cmp = require("cmp")
cmp.setup({ cmp.setup({
-- Highlights the first result always -- Highlights the first result always
completion = { completion = {
completeopt = "menu,menuone,noinsert", completeopt = "menu,menuone,noinsert",
}, },
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
["<C-b>"] = cmp.mapping.scroll_docs(-4), ["<C-b>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4), ["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-o>"] = cmp.mapping.complete(), ["<C-o>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.abort(), ["<C-e>"] = cmp.mapping.abort(),
["<Tab>"] = cmp.mapping(function(fallback) ["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()
else else
fallback() fallback()
end end
end, { "i" }), end, { "i" }),
["<S-Tab>"] = cmp.mapping(function(fallback) ["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_prev_item() cmp.select_prev_item()
else else
fallback() fallback()
end end
end, { "i" }), end, { "i" }),
["<CR>"] = cmp.mapping.confirm({ select = true }), ["<CR>"] = cmp.mapping.confirm({ select = true }),
}), }),
snippet = { snippet = {
expand = function(args) expand = function(args)
require('luasnip').lsp_expand(args.body) require("luasnip").lsp_expand(args.body)
end end,
}, },
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "luasnip" }, { name = "luasnip" },
}, { }, {
{ name = "buffer" }, { name = "buffer" },
}), }),
}) })
end, end,
}, },
{ {
"L3MON4D3/LuaSnip", "L3MON4D3/LuaSnip",
dependencies = { "rafamadriz/friendly-snippets" }, dependencies = { "rafamadriz/friendly-snippets" },
}, },
{ {
"echasnovski/mini.pairs", "echasnovski/mini.pairs",
version = false, version = false,
opts = { opts = {
mappings = { mappings = {
["`"] = { action = "closeopen", pair = "``", neigh_pattern = "[^\\`].", register = { cr = false } }, ["`"] = { action = "closeopen", pair = "``", neigh_pattern = "[^\\`].", register = { cr = false } },
}, },
}, },
}, },
{ {
"echasnovski/mini.surround", "echasnovski/mini.surround",
version = false, version = false,
opts = { opts = {
mappings = { mappings = {
add = "gsa", -- Add surrounding in Normal and Visual modes add = "gsa", -- Add surrounding in Normal and Visual modes
delete = "gsd", -- Delete surrounding delete = "gsd", -- Delete surrounding
find = "gsf", -- Find surrounding (to the right) find = "gsf", -- Find surrounding (to the right)
find_left = "gsF", -- Find surrounding (to the left) find_left = "gsF", -- Find surrounding (to the left)
highlight = "gsh", -- Highlight surrounding highlight = "gsh", -- Highlight surrounding
replace = "gsr", -- Replace surrounding replace = "gsr", -- Replace surrounding
update_n_lines = "gsn", -- Update `n_lines` update_n_lines = "gsn", -- Update `n_lines`
}, },
}, },
}, },
{ {
"JoosepAlviste/nvim-ts-context-commentstring", "JoosepAlviste/nvim-ts-context-commentstring",
opts = { opts = {
enable_autocmd = false, enable_autocmd = false,
}, },
}, },
{ {
"echasnovski/mini.comment", "echasnovski/mini.comment",
version = false, version = false,
opts = { opts = {
options = { options = {
custom_commentstring = function() custom_commentstring = function()
return require("ts_context_commentstring.internal").calculate_commentstring() return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring
or vim.bo.commentstring end,
end, },
}, },
}, },
},
} }

View file

@ -1,47 +1,47 @@
return { return {
{ {
"folke/tokyonight.nvim", "folke/tokyonight.nvim",
lazy = true, lazy = true,
opts = { opts = {
style = "storm", style = "storm",
transparent = true, transparent = true,
dim_inactive = true, dim_inactive = true,
}, },
}, },
{ {
"catppuccin/nvim", "catppuccin/nvim",
name = "catppuccin", name = "catppuccin",
priority = 1000, priority = 1000,
opts = { opts = {
default_integrations = true, default_integrations = true,
dim_inactive = { dim_inactive = {
enabled = true enabled = true,
}, },
flavour = "macchiato", flavour = "macchiato",
integrations = { integrations = {
alpha = true, alpha = true,
cmp = true, cmp = true,
flash = true, flash = true,
gitsigns = true, gitsigns = true,
lsp_trouble = true, lsp_trouble = true,
native_lsp = { native_lsp = {
enabled = true, enabled = true,
underlines = { underlines = {
errors = { "undercurl" }, errors = { "undercurl" },
hints = { "undercurl" }, hints = { "undercurl" },
warnings = { "undercurl" }, warnings = { "undercurl" },
information = { "undercurl" }, information = { "undercurl" },
}, },
}, },
neotree = true, neotree = true,
noice = true, noice = true,
telescope = { telescope = {
enabled = true, enabled = true,
}, },
treesitter = true, treesitter = true,
treesitter_context = true, treesitter_context = true,
which_key = true, which_key = true,
} },
} },
} },
} }

View file

@ -1,132 +1,132 @@
return { return {
{ {
"nvim-neo-tree/neo-tree.nvim", "nvim-neo-tree/neo-tree.nvim",
event = "VeryLazy", event = "VeryLazy",
branch = "v3.x", branch = "v3.x",
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons", "nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
}, },
config = function() config = function()
vim.keymap.set("n", "<Leader>ee", ":Neotree toggle<CR>", { desc = "Toggle Neotree" }) vim.keymap.set("n", "<Leader>ee", ":Neotree toggle<CR>", { desc = "Toggle Neotree" })
vim.keymap.set("n", "<Leader>er", ":Neotree reveal<CR>", { desc = "Reveal file" }) vim.keymap.set("n", "<Leader>er", ":Neotree reveal<CR>", { desc = "Reveal file" })
local nt = require("neo-tree") local nt = require("neo-tree")
nt.setup({ nt.setup({
open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
filesystem = { filesystem = {
filtered_items = { filtered_items = {
show_hidden_count = false, show_hidden_count = false,
hide_dotfiles = false, hide_dotfiles = false,
hide_gitignored = true, hide_gitignored = true,
always_show = { always_show = {
".env", ".env",
".env.local", ".env.local",
}, },
never_show = { never_show = {
".git", ".git",
"thumbs.db", "thumbs.db",
".DS_Store", ".DS_Store",
}, },
}, },
}, },
window = { window = {
mappings = { mappings = {
["m"] = { ["m"] = {
"move", "move",
config = { config = {
show_path = "relative", show_path = "relative",
}, },
}, },
}, },
}, },
event_handlers = { event_handlers = {
{ {
event = "neo_tree_popup_input_ready", event = "neo_tree_popup_input_ready",
handler = function() handler = function()
-- Switch to normal inside popups by default. -- Switch to normal inside popups by default.
vim.cmd.stopinsert() vim.cmd.stopinsert()
end, end,
}, },
}, },
}) })
end, end,
}, },
{ {
"folke/which-key.nvim", "folke/which-key.nvim",
event = "VeryLazy", event = "VeryLazy",
init = function() init = function()
vim.o.timeout = true vim.o.timeout = true
vim.o.timeoutlen = 300 vim.o.timeoutlen = 300
end, end,
opts = {}, opts = {},
}, },
{ {
"folke/trouble.nvim", "folke/trouble.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" }, dependencies = { "nvim-tree/nvim-web-devicons" },
config = function() config = function()
vim.keymap.set("n", "<Leader>tt", ":TroubleToggle<CR>", { desc = "Toggle Trouble" }) vim.keymap.set("n", "<Leader>tt", ":TroubleToggle<CR>", { desc = "Toggle Trouble" })
end, end,
}, },
{ {
"folke/todo-comments.nvim", "folke/todo-comments.nvim",
dependencies = { "nvim-lua/plenary.nvim" }, dependencies = { "nvim-lua/plenary.nvim" },
opts = {}, opts = {},
}, },
{ {
"nvim-pack/nvim-spectre", "nvim-pack/nvim-spectre",
dependencies = { "nvim-lua/plenary.nvim" }, dependencies = { "nvim-lua/plenary.nvim" },
opts = { open_cmd = "noswapfile vnew" }, opts = { open_cmd = "noswapfile vnew" },
keys = { keys = {
{ {
"<leader>sr", "<leader>sr",
function() function()
require("spectre").open() require("spectre").open()
end, end,
desc = "Replace in Files (Spectre)", desc = "Replace in Files (Spectre)",
}, },
}, },
}, },
{ {
"nvim-telescope/telescope.nvim", "nvim-telescope/telescope.nvim",
tag = "0.1.5", tag = "0.1.5",
dependencies = { "nvim-lua/plenary.nvim" }, dependencies = { "nvim-lua/plenary.nvim" },
config = function() config = function()
local builtin = require("telescope.builtin") local builtin = require("telescope.builtin")
vim.keymap.set("n", "<Leader>ff", builtin.git_files, { desc = "Search git_files" }) vim.keymap.set("n", "<Leader>ff", builtin.git_files, { desc = "Search git_files" })
vim.keymap.set("n", "<Leader>fg", builtin.live_grep, { desc = "Grep git_files" }) vim.keymap.set("n", "<Leader>fg", builtin.live_grep, { desc = "Grep git_files" })
vim.keymap.set("n", "<Leader>fh", builtin.help_tags, { desc = "View help tags" }) vim.keymap.set("n", "<Leader>fh", builtin.help_tags, { desc = "View help tags" })
vim.keymap.set("n", "<Leader>fb", builtin.buffers, { desc = "Search buffers" }) vim.keymap.set("n", "<Leader>fb", builtin.buffers, { desc = "Search buffers" })
vim.keymap.set("n", "<Leader>sk", builtin.keymaps, { desc = "View keymaps" }) vim.keymap.set("n", "<Leader>sk", builtin.keymaps, { desc = "View keymaps" })
vim.keymap.set("n", "<Leader>sR", builtin.resume, { desc = "Resume" }) vim.keymap.set("n", "<Leader>sR", builtin.resume, { desc = "Resume" })
vim.keymap.set("n", "<Leader>st", "<cmd>TodoTelescope<cr>", { desc = "Search TODOs" }) vim.keymap.set("n", "<Leader>st", "<cmd>TodoTelescope<cr>", { desc = "Search TODOs" })
end, end,
}, },
{ {
"nvim-telescope/telescope-ui-select.nvim", "nvim-telescope/telescope-ui-select.nvim",
config = function() config = function()
require("telescope").setup({ require("telescope").setup({
defaults = { defaults = {
initial_mode = "normal", initial_mode = "normal",
}, },
extensions = { extensions = {
["ui-select"] = { ["ui-select"] = {
require("telescope.themes").get_dropdown({}), require("telescope.themes").get_dropdown({}),
}, },
}, },
}) })
require("telescope").load_extension("ui-select") require("telescope").load_extension("ui-select")
end, end,
}, },
{ {
"folke/flash.nvim", "folke/flash.nvim",
event = "VeryLazy", event = "VeryLazy",
---@type Flash.Config ---@type Flash.Config
opts = {}, opts = {},
-- stylua: ignore -- stylua: ignore
keys = { keys = {
{ "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
@ -135,37 +135,37 @@ return {
{ "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
{ "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
}, },
}, },
{ {
"kdheepak/lazygit.nvim", "kdheepak/lazygit.nvim",
event = "VeryLazy", event = "VeryLazy",
cmd = { cmd = {
"LazyGit", "LazyGit",
"LazyGitConfig", "LazyGitConfig",
"LazyGitCurrentFile", "LazyGitCurrentFile",
"LazyGitFilter", "LazyGitFilter",
"LazyGitFilterCurrentFile", "LazyGitFilterCurrentFile",
}, },
-- optional for floating window border decoration -- optional for floating window border decoration
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
}, },
keys = { keys = {
{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "LazyGit" } { "<leader>gg", "<cmd>LazyGit<cr>", desc = "LazyGit" },
} },
}, },
{ {
"lewis6991/gitsigns.nvim", "lewis6991/gitsigns.nvim",
event = "VeryLazy", event = "VeryLazy",
opts = { opts = {
signs = { signs = {
add = { text = "" }, add = { text = "" },
change = { text = "" }, change = { text = "" },
delete = { text = "" }, delete = { text = "" },
topdelete = { text = "" }, topdelete = { text = "" },
changedelete = { text = "" }, changedelete = { text = "" },
untracked = { text = "" }, untracked = { text = "" },
}, },
} },
} },
} }

View file

@ -1,21 +1,21 @@
return { return {
"stevearc/conform.nvim", "stevearc/conform.nvim",
opts = { opts = {
formatters_by_ft = { formatters_by_ft = {
css = { "prettierd" }, css = { "prettierd" },
scss = { "prettierd" }, scss = { "prettierd" },
html = { "djlint" }, html = { "djlint" },
lua = { "stylua" }, lua = { "stylua" },
markdown = { "prettierd" }, markdown = { "prettierd" },
javascript = { "prettierd" }, javascript = { "prettierd" },
javascriptreact = { "prettierd" }, javascriptreact = { "prettierd" },
json = { "prettierd" }, json = { "prettierd" },
jsonc = { "prettierd" }, jsonc = { "prettierd" },
typescript = { "prettierd" }, typescript = { "prettierd" },
typescriptreact = { "prettierd" }, typescriptreact = { "prettierd" },
}, },
format_on_save = { format_on_save = {
lsp_fallback = true, lsp_fallback = true,
}, },
}, },
} }

View file

@ -1,38 +1,41 @@
return { { return {
"mfussenegger/nvim-lint", {
opts = { "mfussenegger/nvim-lint",
events = { "BufWritePost", "BufReadPost", "InsertLeave" }, opts = {
linters_by_ft = { events = { "BufWritePost", "BufReadPost", "InsertLeave" },
html = { "djlint" }, linters_by_ft = {
javascript = { "eslint" }, html = { "djlint" },
typescript = { "eslint" }, javascript = { "eslint" },
javascriptreact = { "eslint" }, typescript = { "eslint" },
typescriptreact = { "eslint" }, javascriptreact = { "eslint" },
}, typescriptreact = { "eslint" },
}, },
config = function(_, opts) },
local lint = require("lint") config = function(_, opts)
lint.linters_by_ft = opts.linters_by_ft local lint = require("lint")
lint.linters_by_ft = opts.linters_by_ft
local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
vim.api.nvim_create_autocmd(opts.events, { vim.api.nvim_create_autocmd(opts.events, {
group = lint_augroup, group = lint_augroup,
callback = function() callback = function()
lint.try_lint() lint.try_lint()
end, end,
}) })
end, end,
}, { },
"jose-elias-alvarez/null-ls.nvim", {
event = { "BufWritePost", "BufReadPost", "InsertLeave" }, "jose-elias-alvarez/null-ls.nvim",
opts = function() event = { "BufWritePost", "BufReadPost", "InsertLeave" },
local null_ls = require("null-ls") opts = function()
local diagnostics = null_ls.builtins.diagnostics local null_ls = require("null-ls")
return { local diagnostics = null_ls.builtins.diagnostics
sources = { return {
diagnostics.vale, sources = {
} diagnostics.vale,
} },
end }
} } end,
},
}

View file

@ -1,61 +1,61 @@
return { return {
{ {
"williamboman/mason.nvim", "williamboman/mason.nvim",
opts = {}, opts = {},
}, },
{ {
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
opts = { opts = {
ensure_installed = { ensure_installed = {
"lua_ls", "lua_ls",
"tsserver", "tsserver",
"html", "html",
} },
} },
}, },
{ {
"WhoIsSethDaniel/mason-tool-installer.nvim", "WhoIsSethDaniel/mason-tool-installer.nvim",
opts = { opts = {
ensure_installed = { ensure_installed = {
"djlint", "djlint",
"eslint", "eslint",
"eslint_d", "eslint_d",
"prettierd", "prettierd",
"stylua", "stylua",
"vale", "vale",
}, },
automatic_installation = true, automatic_installation = true,
} },
}, },
-- lspconfig should be the last step. -- lspconfig should be the last step.
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
event = "VeryLazy", event = "VeryLazy",
dependencies = { dependencies = {
"mason.nvim", "mason.nvim",
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
}, },
opts = { opts = {
servers = { servers = {
tsserver = {}, tsserver = {},
lua_ls = {}, lua_ls = {},
} },
}, },
config = function(_, opts) config = function(_, opts)
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
local servers = opts.servers local servers = opts.servers
for server, server_opts in pairs(servers) do for server, server_opts in pairs(servers) do
lspconfig[server].setup(server_opts) lspconfig[server].setup(server_opts)
end end
vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" }) vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" })
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "Go to implementation" }) vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "Go to implementation" })
vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Show signature" }) vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Show signature" })
vim.keymap.set("n", "<Leader>f", vim.lsp.buf.format, { desc = "Format buffer" }) vim.keymap.set("n", "<Leader>f", vim.lsp.buf.format, { desc = "Format buffer" })
vim.keymap.set("n", "<Leader>ca", vim.lsp.buf.code_action, { desc = "View code actions" }) vim.keymap.set("n", "<Leader>ca", vim.lsp.buf.code_action, { desc = "View code actions" })
vim.keymap.set("n", "<leader>cr", vim.lsp.buf.rename, { desc = "Rename" }) vim.keymap.set("n", "<leader>cr", vim.lsp.buf.rename, { desc = "Rename" })
end, end,
}, },
} }

View file

@ -1,41 +1,41 @@
return { return {
{ {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
version = false, version = false,
build = ":TSUpdate", build = ":TSUpdate",
opts = { opts = {
ensure_installed = { ensure_installed = {
"lua", "lua",
"javascript", "javascript",
"typescript", "typescript",
"tsx", "tsx",
"htmldjango", "htmldjango",
"html", "html",
"jsonc", "jsonc",
"json", "json",
"jsdoc", "jsdoc",
"markdown", "markdown",
"markdown_inline", "markdown_inline",
"vim", "vim",
"vimdoc", "vimdoc",
}, },
highlight = { enable = true }, highlight = { enable = true },
indent = { enable = true }, indent = { enable = true },
}, },
config = function(_, opts) config = function(_, opts)
require("nvim-treesitter.configs").setup(opts) require("nvim-treesitter.configs").setup(opts)
end, end,
}, },
{ {
"nvim-treesitter/nvim-treesitter-context", "nvim-treesitter/nvim-treesitter-context",
opts = { opts = {
max_lines = 2, max_lines = 2,
}, },
}, },
{ {
-- TODO: Figure out why this plugin is not working. -- TODO: Figure out why this plugin is not working.
"windwp/nvim-autopairs", "windwp/nvim-autopairs",
event = "VeryLazy", event = "VeryLazy",
opts = {}, opts = {},
}, },
} }

View file

@ -1,163 +1,163 @@
return { return {
{ {
'freddiehaddad/feline.nvim', "freddiehaddad/feline.nvim",
init = function() init = function()
local ctp_feline = require('catppuccin.groups.integrations.feline') local ctp_feline = require("catppuccin.groups.integrations.feline")
ctp_feline.setup() ctp_feline.setup()
require("feline").setup({ require("feline").setup({
components = ctp_feline.get(), components = ctp_feline.get(),
}) })
end end,
}, },
{ {
"famiu/bufdelete.nvim", "famiu/bufdelete.nvim",
keys = { keys = {
{ "<leader>bd", "<cmd>Bdelete<cr>", desc = "Close Buffer" }, { "<leader>bd", "<cmd>Bdelete<cr>", desc = "Close Buffer" },
}, },
}, },
{ {
"akinsho/bufferline.nvim", "akinsho/bufferline.nvim",
event = "VeryLazy", event = "VeryLazy",
keys = { keys = {
{ "<leader>bp", "<cmd>BufferLineTogglePin<cr>", desc = "Toggle Pin" }, { "<leader>bp", "<cmd>BufferLineTogglePin<cr>", desc = "Toggle Pin" },
{ "[b", "<cmd>BufferLineCyclePrev<cr>", desc = "Prev Buffer" }, { "[b", "<cmd>BufferLineCyclePrev<cr>", desc = "Prev Buffer" },
{ "]b", "<cmd>BufferLineCycleNext<cr>", desc = "Next Buffer" }, { "]b", "<cmd>BufferLineCycleNext<cr>", desc = "Next Buffer" },
}, },
opts = { opts = {
highlights = require("catppuccin.groups.integrations.bufferline").get(), highlights = require("catppuccin.groups.integrations.bufferline").get(),
options = { options = {
diagnostics = "nvim_lsp", diagnostics = "nvim_lsp",
offsets = { offsets = {
{ {
filetype = "neo-tree", filetype = "neo-tree",
text = "", text = "",
highlight = "Directory", highlight = "Directory",
text_align = "left", text_align = "left",
}, },
}, },
} },
} },
}, },
{ {
"lukas-reineke/indent-blankline.nvim", "lukas-reineke/indent-blankline.nvim",
opts = { opts = {
indent = { indent = {
char = "", char = "",
tab_char = "", tab_char = "",
}, },
scope = { enabled = false }, scope = { enabled = false },
exclude = { exclude = {
filetypes = { filetypes = {
"help", "help",
"alpha", "alpha",
"dashboard", "dashboard",
"neo-tree", "neo-tree",
"Trouble", "Trouble",
"trouble", "trouble",
"lazy", "lazy",
"mason", "mason",
"notify", "notify",
"toggleterm", "toggleterm",
"lazyterm", "lazyterm",
}, },
}, },
}, },
main = "ibl", main = "ibl",
}, },
{ {
"echasnovski/mini.indentscope", "echasnovski/mini.indentscope",
opts = { opts = {
symbol = "", symbol = "",
options = { try_as_border = true }, options = { try_as_border = true },
}, },
init = function() init = function()
vim.api.nvim_create_autocmd("FileType", { vim.api.nvim_create_autocmd("FileType", {
pattern = { pattern = {
"help", "help",
"alpha", "alpha",
"dashboard", "dashboard",
"neo-tree", "neo-tree",
"Trouble", "Trouble",
"trouble", "trouble",
"lazy", "lazy",
"mason", "mason",
"notify", "notify",
"toggleterm", "toggleterm",
"lazyterm", "lazyterm",
}, },
callback = function() callback = function()
vim.b.miniindentscope_disable = true vim.b.miniindentscope_disable = true
end, end,
}) })
end, end,
}, },
{ {
"stevearc/dressing.nvim", "stevearc/dressing.nvim",
event = "VeryLazy", event = "VeryLazy",
opts = {} opts = {},
}, },
{ {
"rcarriga/nvim-notify", "rcarriga/nvim-notify",
opts = { opts = {
timeout = 2000, timeout = 2000,
stages = "static", stages = "static",
} },
}, },
{ {
"MunifTanjim/nui.nvim" "MunifTanjim/nui.nvim",
}, },
{ {
"folke/noice.nvim", "folke/noice.nvim",
event = "VeryLazy", event = "VeryLazy",
opts = {}, opts = {},
dependencies = { dependencies = {
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
"rcarriga/nvim-notify", "rcarriga/nvim-notify",
} },
}, },
{ {
"goolord/alpha-nvim", "goolord/alpha-nvim",
dependencies = { "nvim-tree/nvim-web-devicons" }, dependencies = { "nvim-tree/nvim-web-devicons" },
config = function() config = function()
local alpha = require("alpha") local alpha = require("alpha")
local dashboard = require("alpha.themes.dashboard") local dashboard = require("alpha.themes.dashboard")
-- https://github.com/MaximilianLloyd/ascii.nvim -- https://github.com/MaximilianLloyd/ascii.nvim
dashboard.section.header.val = { dashboard.section.header.val = {
" ", " ",
" ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ",
" ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ",
" ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ",
" ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ",
" ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ",
" ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ",
" ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ",
" ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ",
" ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ",
" ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ",
" ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ",
" ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ",
" ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ",
" ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ",
" ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ",
" ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ",
" ▄█████████▄▄ ", " ▄█████████▄▄ ",
" ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ",
" ▄▄█████▀▀▀▀ ▀■ ", " ▄▄█████▀▀▀▀ ▀■ ",
" ▄███▀▀▀▀ ", " ▄███▀▀▀▀ ",
" ■▀▀ ", " ■▀▀ ",
" ", " ",
} }
dashboard.section.buttons.val = { dashboard.section.buttons.val = {
dashboard.button("e", " > New File", "<cmd>ene<CR>"), dashboard.button("e", " > New File", "<cmd>ene<CR>"),
dashboard.button("SPC ee", " > File explorer", "<cmd>Neotree<CR>"), dashboard.button("SPC ee", " > File explorer", "<cmd>Neotree<CR>"),
dashboard.button("q", " > Quit", "<cmd>qa<CR>"), dashboard.button("q", " > Quit", "<cmd>qa<CR>"),
} }
alpha.setup(dashboard.opts) alpha.setup(dashboard.opts)
end, end,
} },
} }