From 6e041e7d65d67cae97496b6b18395256941402fc Mon Sep 17 00:00:00 2001 From: Stevan Freeborn Date: Sun, 19 Jul 2026 11:15:18 -0500 Subject: [PATCH] chore: run stylua --- init.lua | 25 +++-- lazy-lock.json | 2 +- lua/plugins.lua | 3 +- lua/plugins/completions.lua | 160 ++++++++++++++++---------------- lua/plugins/dadbod.lua | 2 +- lua/plugins/dashboard.lua | 112 +++++++++++----------- lua/plugins/lazygit.lua | 30 +++--- lua/plugins/lsp.lua | 12 +-- lua/plugins/lualine.lua | 12 +-- lua/plugins/neotest.lua | 154 +++++++++++++++--------------- lua/plugins/neotree.lua | 100 ++++++++++---------- lua/plugins/none-ls.lua | 16 ++-- lua/plugins/themes.lua | 82 ++++++++-------- lua/plugins/treesitter.lua | 180 ++++++++++++++++++------------------ lua/plugins/which-key.lua | 10 +- 15 files changed, 448 insertions(+), 452 deletions(-) diff --git a/init.lua b/init.lua index 5c724b1..f012345 100644 --- a/init.lua +++ b/init.lua @@ -1,20 +1,18 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end - + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end end vim.opt.rtp:prepend(lazypath) @@ -22,4 +20,3 @@ vim.opt.rtp:prepend(lazypath) require("vim-options") require("lazy").setup("plugins") require("current-theme") - diff --git a/lazy-lock.json b/lazy-lock.json index d059646..ea92cda 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -53,6 +53,6 @@ "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" }, "vim-dadbod-ui": { "branch": "master", "commit": "afd07819d8efcefc3317205b855ad4e3513b0011" }, "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, - "watchexec.nvim": { "branch": "main", "commit": "d424bd730784696e3f97f132581ba6fed39d16b0" }, + "watchexec.nvim": { "branch": "main", "commit": "6530a1e66fa243d1befad72a98d8f00053be229a" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/lua/plugins.lua b/lua/plugins.lua index 4bb3f15..a564707 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -1,2 +1 @@ -return { } - +return {} diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua index e15817d..4ba7ac4 100644 --- a/lua/plugins/completions.lua +++ b/lua/plugins/completions.lua @@ -1,85 +1,85 @@ return { - { - "windwp/nvim-autopairs", - event = "InsertEnter", - config = function() - require("nvim-autopairs").setup() - end, - }, - { - "hrsh7th/cmp-nvim-lsp", - }, - { - "L3MON4D3/LuaSnip", - dependencies = { - "saadparwaiz1/cmp_luasnip", - "rafamadriz/friendly-snippets", - }, - build = "make install_jsregexp", - }, - { - "hrsh7th/nvim-cmp", - config = function() - local luasnip = require("luasnip") - local cmp = require("cmp") + { + "windwp/nvim-autopairs", + event = "InsertEnter", + config = function() + require("nvim-autopairs").setup() + end, + }, + { + "hrsh7th/cmp-nvim-lsp", + }, + { + "L3MON4D3/LuaSnip", + dependencies = { + "saadparwaiz1/cmp_luasnip", + "rafamadriz/friendly-snippets", + }, + build = "make install_jsregexp", + }, + { + "hrsh7th/nvim-cmp", + config = function() + local luasnip = require("luasnip") + local cmp = require("cmp") - local cmp_autopairs = require("nvim-autopairs.completion.cmp") - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) + local cmp_autopairs = require("nvim-autopairs.completion.cmp") + cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - require("luasnip.loaders.from_vscode").lazy_load() + require("luasnip.loaders.from_vscode").lazy_load() - cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.close(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping(function() - if cmp.visible.docs() then - cmp.close_docs() - else - cmp.open_docs() - end - end), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }), - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" }, - }, { - { name = "buffer" }, - }), - }) - end, - }, + cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.close(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping(function() + if cmp.visible.docs() then + cmp.close_docs() + else + cmp.open_docs() + end + end), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }), + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "luasnip" }, + }, { + { name = "buffer" }, + }), + }) + end, + }, } diff --git a/lua/plugins/dadbod.lua b/lua/plugins/dadbod.lua index b708258..35d899a 100644 --- a/lua/plugins/dadbod.lua +++ b/lua/plugins/dadbod.lua @@ -13,6 +13,6 @@ return { }, init = function() vim.g.db_ui_use_nerd_fonts = 1 - vim.g.db_ui_auto_execute_table_helpers = 1 + vim.g.db_ui_auto_execute_table_helpers = 1 end, } diff --git a/lua/plugins/dashboard.lua b/lua/plugins/dashboard.lua index 69536b6..2a3e54a 100644 --- a/lua/plugins/dashboard.lua +++ b/lua/plugins/dashboard.lua @@ -1,8 +1,8 @@ return { - "nvimdev/dashboard-nvim", - event = "VimEnter", - config = function() - local logo = [[ + "nvimdev/dashboard-nvim", + event = "VimEnter", + config = function() + local logo = [[ @@ -28,59 +28,59 @@ return { ]] - local opts = { - theme = "doom", - hide = { - statusline = false, - }, - config = { - header = vim.split(logo, "\n"), - center = { - { - action = 'lua require("telescope.builtin").find_files()', - desc = " Find File", - icon = " ", - key = "f", - }, - { action = "ene | startinsert", desc = " New File", icon = " ", key = "n" }, - { - action = 'lua require("telescope.builtin").oldfiles()', - desc = " Recent Files", - icon = " ", - key = "r", - }, - { - action = 'lua require("telescope.builtin").live_grep()', - desc = " Find Text", - icon = " ", - key = "g", - }, - { action = "Lazy", desc = " Lazy", icon = "󰒲 ", key = "l" }, - { - action = function() - vim.api.nvim_input("qa") - end, - desc = " Quit", - icon = " ", - key = "q", - }, - }, - footer = function() - local stats = require("lazy").stats() - local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100) - return { "⚡ Neovim loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms .. "ms" } - end, - }, - } + local opts = { + theme = "doom", + hide = { + statusline = false, + }, + config = { + header = vim.split(logo, "\n"), + center = { + { + action = 'lua require("telescope.builtin").find_files()', + desc = " Find File", + icon = " ", + key = "f", + }, + { action = "ene | startinsert", desc = " New File", icon = " ", key = "n" }, + { + action = 'lua require("telescope.builtin").oldfiles()', + desc = " Recent Files", + icon = " ", + key = "r", + }, + { + action = 'lua require("telescope.builtin").live_grep()', + desc = " Find Text", + icon = " ", + key = "g", + }, + { action = "Lazy", desc = " Lazy", icon = "󰒲 ", key = "l" }, + { + action = function() + vim.api.nvim_input("qa") + end, + desc = " Quit", + icon = " ", + key = "q", + }, + }, + footer = function() + local stats = require("lazy").stats() + local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100) + return { "⚡ Neovim loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms .. "ms" } + end, + }, + } - require("dashboard").setup(opts) + require("dashboard").setup(opts) - for _, button in ipairs(opts.config.center) do - button.desc = button.desc .. string.rep(" ", 43 - #button.desc) - button.key_format = " %s" - end + for _, button in ipairs(opts.config.center) do + button.desc = button.desc .. string.rep(" ", 43 - #button.desc) + button.key_format = " %s" + end - vim.api.nvim_set_hl(0, "DashboardHeader", { fg = "#b39cd0", bold = true }) - vim.api.nvim_set_hl(0, "DashboardFooter", { fg = "#b39cd0", bold = true }) - end, + vim.api.nvim_set_hl(0, "DashboardHeader", { fg = "#b39cd0", bold = true }) + vim.api.nvim_set_hl(0, "DashboardFooter", { fg = "#b39cd0", bold = true }) + end, } diff --git a/lua/plugins/lazygit.lua b/lua/plugins/lazygit.lua index e944f57..0e905c5 100644 --- a/lua/plugins/lazygit.lua +++ b/lua/plugins/lazygit.lua @@ -1,17 +1,17 @@ return { - "kdheepak/lazygit.nvim", - lazy = true, - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - dependencies = { - "nvim-lua/plenary.nvim", - }, - keys = { - { "lg", "LazyGit", desc = "LazyGit" } - } + "kdheepak/lazygit.nvim", + lazy = true, + cmd = { + "LazyGit", + "LazyGitConfig", + "LazyGitCurrentFile", + "LazyGitFilter", + "LazyGitFilterCurrentFile", + }, + dependencies = { + "nvim-lua/plenary.nvim", + }, + keys = { + { "lg", "LazyGit", desc = "LazyGit" }, + }, } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index a7da45e..a060036 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -282,15 +282,15 @@ return { capabilities = capabilities, }) - vim.lsp.enable("rust_analyzer") + vim.lsp.enable("rust_analyzer") - vim.lsp.config("clangd", { - capabilities = capabilities, - }) + vim.lsp.config("clangd", { + capabilities = capabilities, + }) - vim.lsp.enable("clangd") + vim.lsp.enable("clangd") - vim.lsp.config("gh_actions_ls", { + vim.lsp.config("gh_actions_ls", { capabilities = capabilities, filetypes = { "yaml" }, settings = { diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 12b13c0..41c5268 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -1,8 +1,8 @@ return { - "nvim-lualine/lualine.nvim", - config = function() - require("lualine").setup({ - options = { theme = "dracula" }, - }) - end, + "nvim-lualine/lualine.nvim", + config = function() + require("lualine").setup({ + options = { theme = "dracula" }, + }) + end, } diff --git a/lua/plugins/neotest.lua b/lua/plugins/neotest.lua index 0e58cfc..402198e 100644 --- a/lua/plugins/neotest.lua +++ b/lua/plugins/neotest.lua @@ -1,87 +1,87 @@ return { - "nvim-neotest/neotest", - dependencies = { - "antoinemadec/FixCursorHold.nvim", - "nvim-neotest/neotest-python", - "nvim-neotest/neotest-jest", - "marilari88/neotest-vitest", - { "stevanfreeborn/neotest-playwright", branch = "fork" }, - "issafalcon/neotest-dotnet", - { "stevanfreeborn/neotest-go" }, - -- { - -- "mrcjkb/rustaceanvim", - -- version = "^6", - -- lazy = false, - -- }, - }, - config = function() - local neotest = require("neotest") + "nvim-neotest/neotest", + dependencies = { + "antoinemadec/FixCursorHold.nvim", + "nvim-neotest/neotest-python", + "nvim-neotest/neotest-jest", + "marilari88/neotest-vitest", + { "stevanfreeborn/neotest-playwright", branch = "fork" }, + "issafalcon/neotest-dotnet", + { "stevanfreeborn/neotest-go" }, + -- { + -- "mrcjkb/rustaceanvim", + -- version = "^6", + -- lazy = false, + -- }, + }, + config = function() + local neotest = require("neotest") - local neotest_ns = vim.api.nvim_create_namespace("neotest") + local neotest_ns = vim.api.nvim_create_namespace("neotest") - vim.diagnostic.config({ - virtual_text = { - format = function(diagnostic) - local message = diagnostic.message:gsub("\n", " "):gsub("\t", " "):gsub("%s+", " "):gsub("^%s+", "") - return message - end, - }, - }, neotest_ns) + vim.diagnostic.config({ + virtual_text = { + format = function(diagnostic) + local message = diagnostic.message:gsub("\n", " "):gsub("\t", " "):gsub("%s+", " "):gsub("^%s+", "") + return message + end, + }, + }, neotest_ns) - neotest.setup({ - log_level = vim.log.levels.DEBUG, - summary = { - follow = false, - }, - adapters = { - require("neotest-python"), - require("neotest-jest"), - require("neotest-vitest"), - require("neotest-playwright").adapter({ - options = { - persist_project_selection = true, - enable_dynamic_test_discovery = true, - preset = "headed", - experimental = { - telescope = { - enabled = true, - }, - }, - get_playwright_binary = function() - return vim.loop.cwd() .. "/node_modules/.bin/playwright" - end, - }, - }), - require("neotest-dotnet")({ - dap = { - adapter_name = "coreclr", - }, - discovery_root = "solution", - }), - require("neotest-go"), - -- require('rustaceanvim.neotest'), - }, - }) + neotest.setup({ + log_level = vim.log.levels.DEBUG, + summary = { + follow = false, + }, + adapters = { + require("neotest-python"), + require("neotest-jest"), + require("neotest-vitest"), + require("neotest-playwright").adapter({ + options = { + persist_project_selection = true, + enable_dynamic_test_discovery = true, + preset = "headed", + experimental = { + telescope = { + enabled = true, + }, + }, + get_playwright_binary = function() + return vim.loop.cwd() .. "/node_modules/.bin/playwright" + end, + }, + }), + require("neotest-dotnet")({ + dap = { + adapter_name = "coreclr", + }, + discovery_root = "solution", + }), + require("neotest-go"), + -- require('rustaceanvim.neotest'), + }, + }) - vim.keymap.set("n", "tr", neotest.run.run, { desc = "Run nearest test" }) + vim.keymap.set("n", "tr", neotest.run.run, { desc = "Run nearest test" }) - vim.keymap.set("n", "td", function() - neotest.run.run({ strategy = "dap" }) - end, { desc = "Debug nearest test" }) + vim.keymap.set("n", "td", function() + neotest.run.run({ strategy = "dap" }) + end, { desc = "Debug nearest test" }) - vim.keymap.set("n", "ts", neotest.run.stop, { desc = "Stop nearest test" }) + vim.keymap.set("n", "ts", neotest.run.stop, { desc = "Stop nearest test" }) - vim.keymap.set("n", "tf", function() - neotest.run.run(vim.fn.expand("%")) - end, { desc = "Run file tests" }) + vim.keymap.set("n", "tf", function() + neotest.run.run(vim.fn.expand("%")) + end, { desc = "Run file tests" }) - vim.keymap.set("n", "to", neotest.output.open, { desc = "Display output" }) - vim.keymap.set("n", "top", neotest.output_panel.open, { desc = "Display output panel" }) - vim.keymap.set("n", "topc", neotest.output_panel.clear, { desc = "Clear output" }) - vim.keymap.set("n", "", neotest.summary.open, { desc = "Display summary" }) - vim.keymap.set("n", "tsr", neotest.summary.run_marked, { desc = "Run marked tests" }) - vim.keymap.set("n", "tsc", neotest.summary.clear_marked, { desc = "Clear marked tests" }) - vim.keymap.set("n", "tw", neotest.watch.watch, { desc = "Start watching tests" }) - vim.keymap.set("n", "twc", neotest.watch.stop, { desc = "Stop watching tests" }) - end, + vim.keymap.set("n", "to", neotest.output.open, { desc = "Display output" }) + vim.keymap.set("n", "top", neotest.output_panel.open, { desc = "Display output panel" }) + vim.keymap.set("n", "topc", neotest.output_panel.clear, { desc = "Clear output" }) + vim.keymap.set("n", "", neotest.summary.open, { desc = "Display summary" }) + vim.keymap.set("n", "tsr", neotest.summary.run_marked, { desc = "Run marked tests" }) + vim.keymap.set("n", "tsc", neotest.summary.clear_marked, { desc = "Clear marked tests" }) + vim.keymap.set("n", "tw", neotest.watch.watch, { desc = "Start watching tests" }) + vim.keymap.set("n", "twc", neotest.watch.stop, { desc = "Stop watching tests" }) + end, } diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua index 2d47107..504239b 100644 --- a/lua/plugins/neotree.lua +++ b/lua/plugins/neotree.lua @@ -1,55 +1,55 @@ return { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - config = function() - require("neo-tree").setup({ - filesystem = { - use_libuv_file_watcher = true, - filtered_items = { - visible = true, - }, - }, - window = { - mappings = { - ["Y"] = { - function(state) - local node = state.tree:get_node() - local path = node:get_id() - vim.fn.setreg("+", path, "c") - vim.notify("Copied: " .. path .. " to clipboard") - end, - desc = "Copy path to clipboard", - }, - ["O"] = { - function(state) - local node = state.tree:get_node() + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + require("neo-tree").setup({ + filesystem = { + use_libuv_file_watcher = true, + filtered_items = { + visible = true, + }, + }, + window = { + mappings = { + ["Y"] = { + function(state) + local node = state.tree:get_node() + local path = node:get_id() + vim.fn.setreg("+", path, "c") + vim.notify("Copied: " .. path .. " to clipboard") + end, + desc = "Copy path to clipboard", + }, + ["O"] = { + function(state) + local node = state.tree:get_node() vim.notify("Opening: " .. node.path) - local _, err = vim.ui.open(node.path) + local _, err = vim.ui.open(node.path) - if err then - vim.notify("Error opening explorer: " .. err, vim.log.levels.ERROR) - end - end, - desc = "Open in default app", - }, - ["P"] = { "toggle_preview", config = { use_float = false } }, - }, - }, - event_handlers = { - { - event = "file_open_requested", - handler = function() - vim.cmd("Neotree close") - end, - }, - }, - }) - vim.keymap.set("n", "", ":Neotree filesystem reveal right", { desc = "Neotree show explorer" }) - end, + if err then + vim.notify("Error opening explorer: " .. err, vim.log.levels.ERROR) + end + end, + desc = "Open in default app", + }, + ["P"] = { "toggle_preview", config = { use_float = false } }, + }, + }, + event_handlers = { + { + event = "file_open_requested", + handler = function() + vim.cmd("Neotree close") + end, + }, + }, + }) + vim.keymap.set("n", "", ":Neotree filesystem reveal right", { desc = "Neotree show explorer" }) + end, } diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua index 28c4801..95086d4 100644 --- a/lua/plugins/none-ls.lua +++ b/lua/plugins/none-ls.lua @@ -1,16 +1,16 @@ return { "nvimtools/none-ls.nvim", - config = function() + config = function() local null_ls = require("null-ls") null_ls.setup({ - sources = { - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.prettier, - null_ls.builtins.formatting.black, - null_ls.builtins.formatting.isort, - null_ls.builtins.formatting.clang_format, - } + sources = { + null_ls.builtins.formatting.stylua, + null_ls.builtins.formatting.prettier, + null_ls.builtins.formatting.black, + null_ls.builtins.formatting.isort, + null_ls.builtins.formatting.clang_format, + }, }) vim.keymap.set("n", "gf", vim.lsp.buf.format, { desc = "Format" }) diff --git a/lua/plugins/themes.lua b/lua/plugins/themes.lua index 97938d9..cd0e348 100644 --- a/lua/plugins/themes.lua +++ b/lua/plugins/themes.lua @@ -1,43 +1,43 @@ return { - { - "StevanFreeborn/lavender-dimmed.nvim", - name = "lavender-dimmed", - lazy = false, - priority = 1000, - config = function() - require("lavender-dimmed").setup() - vim.cmd.colorscheme("lavender-dimmed") - end, - }, - { - "projekt0n/github-nvim-theme", - name = "github-theme", - lazy = false, - priority = 1000, - config = function() - require("github-theme").setup() - end - }, - { - "catppuccin/nvim", - name = "catppuccin", - lazy = false, - priority = 1000, - config = function() - require("catppuccin").setup() - end - }, - { - "olimorris/onedarkpro.nvim", - lazy = false, - priority = 1000, - config = function() - require("onedarkpro").setup() - end - }, - { - "notken12/base46-colors", - lazy = false, - priority = 1000, - } + { + "StevanFreeborn/lavender-dimmed.nvim", + name = "lavender-dimmed", + lazy = false, + priority = 1000, + config = function() + require("lavender-dimmed").setup() + vim.cmd.colorscheme("lavender-dimmed") + end, + }, + { + "projekt0n/github-nvim-theme", + name = "github-theme", + lazy = false, + priority = 1000, + config = function() + require("github-theme").setup() + end, + }, + { + "catppuccin/nvim", + name = "catppuccin", + lazy = false, + priority = 1000, + config = function() + require("catppuccin").setup() + end, + }, + { + "olimorris/onedarkpro.nvim", + lazy = false, + priority = 1000, + config = function() + require("onedarkpro").setup() + end, + }, + { + "notken12/base46-colors", + lazy = false, + priority = 1000, + }, } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 7c46e17..275206a 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,98 +1,98 @@ return { - { - "nvim-treesitter/nvim-treesitter-context", - config = function() - require("treesitter-context").setup() - end, - }, - { - "hiphish/rainbow-delimiters.nvim", - config = function() - require("rainbow-delimiters.setup").setup() - end, - }, - { - "lukas-reineke/indent-blankline.nvim", - main = "ibl", - config = function() - local highlight = { - "RainbowRed", - "RainbowYellow", - "RainbowBlue", - "RainbowOrange", - "RainbowGreen", - "RainbowViolet", - "RainbowCyan", - } + { + "nvim-treesitter/nvim-treesitter-context", + config = function() + require("treesitter-context").setup() + end, + }, + { + "hiphish/rainbow-delimiters.nvim", + config = function() + require("rainbow-delimiters.setup").setup() + end, + }, + { + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + config = function() + local highlight = { + "RainbowRed", + "RainbowYellow", + "RainbowBlue", + "RainbowOrange", + "RainbowGreen", + "RainbowViolet", + "RainbowCyan", + } - local hooks = require("ibl.hooks") + local hooks = require("ibl.hooks") - hooks.register(hooks.type.HIGHLIGHT_SETUP, function() - vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" }) - vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" }) - vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" }) - vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" }) - vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" }) - vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" }) - vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" }) - end) + hooks.register(hooks.type.HIGHLIGHT_SETUP, function() + vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" }) + vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" }) + vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" }) + vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" }) + vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" }) + vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" }) + vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" }) + end) - vim.g.rainbow_delimiters = { highlight = highlight } + vim.g.rainbow_delimiters = { highlight = highlight } - require("ibl").setup({ - scope = { highlight = highlight }, - exclude = { filetypes = { "dashboard" } }, - }) + require("ibl").setup({ + scope = { highlight = highlight }, + exclude = { filetypes = { "dashboard" } }, + }) - hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark) - end, - }, - { - "nvim-treesitter/nvim-treesitter", - branch = "main", - build = ":TSUpdate", - config = function() - local config = require("nvim-treesitter.config") + hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark) + end, + }, + { + "nvim-treesitter/nvim-treesitter", + branch = "main", + build = ":TSUpdate", + config = function() + local config = require("nvim-treesitter.config") - config.setup({ - auto_install = true, - ensure_installed = { - "fsharp", - "bash", - "css", - "html", - "javascript", - "json", - "lua", - "python", - "typescript", - "tsx", - "vue", - "yaml", - "c_sharp", - "rust", - "csv", - "dockerfile", - "editorconfig", - "json", - "jsdoc", - "jsonc", - "markdown", - "markdown_inline", - "nginx", - "proto", - "sql", - "toml", - "ssh_config", - "xml", - "go", - "c", - }, - indent = { enabled = true }, - highlight = { - enabled = true, - }, - }) - end, - }, + config.setup({ + auto_install = true, + ensure_installed = { + "fsharp", + "bash", + "css", + "html", + "javascript", + "json", + "lua", + "python", + "typescript", + "tsx", + "vue", + "yaml", + "c_sharp", + "rust", + "csv", + "dockerfile", + "editorconfig", + "json", + "jsdoc", + "jsonc", + "markdown", + "markdown_inline", + "nginx", + "proto", + "sql", + "toml", + "ssh_config", + "xml", + "go", + "c", + }, + indent = { enabled = true }, + highlight = { + enabled = true, + }, + }) + end, + }, } diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua index 98ccca9..d03147f 100644 --- a/lua/plugins/which-key.lua +++ b/lua/plugins/which-key.lua @@ -1,7 +1,7 @@ return { - "folke/which-key.nvim", - dependencies = { "echasnovski/mini.icons" }, - config = function() - require("which-key").setup() - end + "folke/which-key.nvim", + dependencies = { "echasnovski/mini.icons" }, + config = function() + require("which-key").setup() + end, }