diff --git a/dots/.config/nvim/after/ftplugin/sh.lua b/dots/.config/nvim/after/ftplugin/sh.lua index dd969e74..cd9607f0 100644 --- a/dots/.config/nvim/after/ftplugin/sh.lua +++ b/dots/.config/nvim/after/ftplugin/sh.lua @@ -5,5 +5,5 @@ vim.keymap.set("n", "fr", function() require("toggleterm").exec("bash " .. vim.api.nvim_buf_get_name(0)) end, { buffer = true, - desc = "Bash: Save and Run Current Buffer" + desc = "Bash: Save and Run Current Buffer", }) diff --git a/dots/.config/nvim/lua/core/cmds.lua b/dots/.config/nvim/lua/core/cmds.lua index c88a707a..281ed8ab 100644 --- a/dots/.config/nvim/lua/core/cmds.lua +++ b/dots/.config/nvim/lua/core/cmds.lua @@ -14,7 +14,7 @@ M.setup = function() bufhidden = "wipe", swapfile = false, readonly = true, - winbar = vim.opt.winbar:get() + winbar = vim.opt.winbar:get(), } for option, value in pairs(opts) do vim.api.nvim_set_option_value(option, value, { scope = "local" }) diff --git a/dots/.config/nvim/lua/plugins/configs/cmp.lua b/dots/.config/nvim/lua/plugins/configs/cmp.lua index 7e7b4896..ab8dc7ce 100644 --- a/dots/.config/nvim/lua/plugins/configs/cmp.lua +++ b/dots/.config/nvim/lua/plugins/configs/cmp.lua @@ -349,8 +349,8 @@ return { compare.exact, -- Copied from cmp-under-comparator function(entry1, entry2) - local _, entry1_under = entry1.completion_item.label:find "^_+" - local _, entry2_under = entry2.completion_item.label:find "^_+" + local _, entry1_under = entry1.completion_item.label:find("^_+") + local _, entry2_under = entry2.completion_item.label:find("^_+") entry1_under = entry1_under or 0 entry2_under = entry2_under or 0 if entry1_under > entry2_under then diff --git a/dots/.config/nvim/lua/plugins/configs/formatter.lua b/dots/.config/nvim/lua/plugins/configs/formatter.lua index 1b1369d0..c3c230db 100644 --- a/dots/.config/nvim/lua/plugins/configs/formatter.lua +++ b/dots/.config/nvim/lua/plugins/configs/formatter.lua @@ -39,9 +39,9 @@ return { return { exe = "shfmt", args = { - "-" + "-", }, - stdin = true + stdin = true, } end, asm = function() diff --git a/dots/.config/nvim/lua/plugins/configs/git.lua b/dots/.config/nvim/lua/plugins/configs/git.lua index 000f74ab..5068fc8e 100644 --- a/dots/.config/nvim/lua/plugins/configs/git.lua +++ b/dots/.config/nvim/lua/plugins/configs/git.lua @@ -2,7 +2,7 @@ return { { "sindrets/diffview.nvim", keys = { - { "dd", "DiffviewOpen", desc = "Diff View: Open" }, + { "dd", "DiffviewOpen", desc = "Diff View: Open" }, { "dh", "DiffviewFileHistory", desc = "Diff View: File History" }, }, cmd = { diff --git a/dots/.config/nvim/lua/plugins/configs/heirline.lua b/dots/.config/nvim/lua/plugins/configs/heirline.lua index ef9959b4..e2b9220a 100644 --- a/dots/.config/nvim/lua/plugins/configs/heirline.lua +++ b/dots/.config/nvim/lua/plugins/configs/heirline.lua @@ -904,7 +904,7 @@ return { provider = " [", hl = { fg = colors.peachRed, - bg = colors.sumiInk4 + bg = colors.sumiInk4, }, }, { @@ -921,7 +921,7 @@ return { provider = "]", hl = { fg = colors.peachRed, - bg = colors.sumiInk4 + bg = colors.sumiInk4, }, }, }, diff --git a/dots/.config/nvim/lua/plugins/configs/lsp.lua b/dots/.config/nvim/lua/plugins/configs/lsp.lua index 628a0b24..0486d8c6 100644 --- a/dots/.config/nvim/lua/plugins/configs/lsp.lua +++ b/dots/.config/nvim/lua/plugins/configs/lsp.lua @@ -135,11 +135,11 @@ return { "MasonUpdate", "MasonInstall", "MasonUninstall", - "MasonUninstallAll" + "MasonUninstallAll", }, opts = { - max_concurrent_installers = 12 - } + max_concurrent_installers = 12, + }, }, "simrat39/rust-tools.nvim", "Hoffs/omnisharp-extended-lsp.nvim", @@ -429,7 +429,7 @@ return { "vimls", "marksman", "asm_lsp", - "typst_lsp" + "typst_lsp", }) do lspconfig[server].setup(server_opts) end diff --git a/dots/.config/nvim/lua/plugins/configs/neo-tree.lua b/dots/.config/nvim/lua/plugins/configs/neo-tree.lua index 8dca7a7a..4e41c4fe 100644 --- a/dots/.config/nvim/lua/plugins/configs/neo-tree.lua +++ b/dots/.config/nvim/lua/plugins/configs/neo-tree.lua @@ -5,7 +5,7 @@ return { "nvim-tree/nvim-web-devicons", "nvim-lua/plenary.nvim", "MunifTanjim/nui.nvim", - "miversen33/netman.nvim" + "miversen33/netman.nvim", }, cmd = "Neotree", keys = { @@ -21,9 +21,9 @@ return { if vim.fn.isdirectory(f) ~= 0 then vim.cmd("Neotree current dir=" .. f) -- neo-tree is loaded now, delete the init autocmd - vim.api.nvim_clear_autocmds { group = "NeoTreeInit" } + vim.api.nvim_clear_autocmds({ group = "NeoTreeInit" }) end - end + end, }) end, opts = function() diff --git a/dots/.config/nvim/lua/plugins/configs/netman.lua b/dots/.config/nvim/lua/plugins/configs/netman.lua index aa8b5ddc..3bd1568a 100644 --- a/dots/.config/nvim/lua/plugins/configs/netman.lua +++ b/dots/.config/nvim/lua/plugins/configs/netman.lua @@ -3,6 +3,6 @@ return { "miversen33/netman.nvim", config = function() require("netman") - end - } + end, + }, } diff --git a/dots/.config/nvim/lua/plugins/configs/nvim-ufo.lua b/dots/.config/nvim/lua/plugins/configs/nvim-ufo.lua index 448356bf..d46c2459 100644 --- a/dots/.config/nvim/lua/plugins/configs/nvim-ufo.lua +++ b/dots/.config/nvim/lua/plugins/configs/nvim-ufo.lua @@ -1,7 +1,7 @@ vim.api.nvim_create_autocmd("BufReadPre", { callback = function() vim.b.ufo_foldlevel = 0 - end + end, }) ---@param num integer Set the fold level to this number @@ -51,7 +51,7 @@ return { if count == 0 then count = 1 end - change_buf_foldlevel_by(-(count)) + change_buf_foldlevel_by(-count) end, desc = "UFO: Fold More", }, diff --git a/dots/.config/nvim/lua/plugins/configs/org-mode.lua b/dots/.config/nvim/lua/plugins/configs/org-mode.lua index 812d24f1..a82f2ae8 100644 --- a/dots/.config/nvim/lua/plugins/configs/org-mode.lua +++ b/dots/.config/nvim/lua/plugins/configs/org-mode.lua @@ -1,6 +1,7 @@ return { { "nvim-orgmode/orgmode", + dir = "~/Git/Neovim/Orgmode", dependencies = { { "nvim-treesitter/nvim-treesitter" }, { @@ -32,7 +33,7 @@ return { require("orgmode").setup({ org_agenda_files = { "~/Git/College/**/*", - "~/Notes/**/*" + "~/Notes/**/*", }, org_default_notes_file = "~/Notes/notes.org", org_agenda_start_day = "-1d", diff --git a/dots/.config/nvim/lua/plugins/configs/statuscol.lua b/dots/.config/nvim/lua/plugins/configs/statuscol.lua index 350baa73..26574d4e 100644 --- a/dots/.config/nvim/lua/plugins/configs/statuscol.lua +++ b/dots/.config/nvim/lua/plugins/configs/statuscol.lua @@ -7,33 +7,37 @@ return { -- HACK: Ensure all signs get the correct CursorLineSign set to their "culhl" value -- This, in effect, extends the CursorLine background highlight into the signcolumn - vim.uv.new_timer():start(50, 1000, vim.schedule_wrap(function() - -- Make all signs support "CusorLine.*" highlights - local signs_defined = vim.fn.sign_getdefined() - if #signs_defined == last_sign_def_len or #signs_defined == 0 then - return - end - last_sign_def_len = signs_defined - local bg = vim.api.nvim_get_hl(0, { name = "SignColumn", link = false }).bg - local cl_bg = vim.api.nvim_get_hl(0, { name = "CursorLineSign", link = false }).bg - for _, sign in ipairs(signs_defined) do - local name = sign.texthl - if name then - local hl = vim.api.nvim_get_hl(0, { name = name, link = false }) - vim.api.nvim_set_hl(0, name, { fg = hl.fg, bg = bg }) - name = name .. "Cul" - vim.api.nvim_set_hl(0, name, { fg = hl.fg, bg = cl_bg }) - vim.fn.sign_define(sign.name, { culhl = name }) + vim.uv.new_timer():start( + 50, + 1000, + vim.schedule_wrap(function() + -- Make all signs support "CusorLine.*" highlights + local signs_defined = vim.fn.sign_getdefined() + if #signs_defined == last_sign_def_len or #signs_defined == 0 then + return end - end - end)) + last_sign_def_len = signs_defined + local bg = vim.api.nvim_get_hl(0, { name = "SignColumn", link = false }).bg + local cl_bg = vim.api.nvim_get_hl(0, { name = "CursorLineSign", link = false }).bg + for _, sign in ipairs(signs_defined) do + local name = sign.texthl + if name then + local hl = vim.api.nvim_get_hl(0, { name = name, link = false }) + vim.api.nvim_set_hl(0, name, { fg = hl.fg, bg = bg }) + name = name .. "Cul" + vim.api.nvim_set_hl(0, name, { fg = hl.fg, bg = cl_bg }) + vim.fn.sign_define(sign.name, { culhl = name }) + end + end + end) + ) return { setopt = true, relculright = false, segments = { - { text = { "%s" }, click = "v:lua.ScSa" }, - { text = { builtin.lnumfunc }, click = "v:lua.ScLa" }, + { text = { "%s" }, click = "v:lua.ScSa" }, + { text = { builtin.lnumfunc }, click = "v:lua.ScLa" }, { text = { " ", builtin.foldfunc, " " }, click = "v:lua.ScFa" }, }, } @@ -48,7 +52,7 @@ return { delay = 0, }, -- HACK: This allows the gitsigns to correctly use the culhl for their bg - _extmark_signs = false - } + _extmark_signs = false, + }, }, } diff --git a/dots/.config/nvim/lua/plugins/configs/telescope.lua b/dots/.config/nvim/lua/plugins/configs/telescope.lua index c1f49c4e..767d69a3 100644 --- a/dots/.config/nvim/lua/plugins/configs/telescope.lua +++ b/dots/.config/nvim/lua/plugins/configs/telescope.lua @@ -43,7 +43,7 @@ return { cmd = { "FrecencyMigrateDB", "FrecencyValidate", - "FrecencyDelete" + "FrecencyDelete", }, }, "debugloop/telescope-undo.nvim", @@ -151,7 +151,7 @@ return { }, frecency = { db_safe_mode = false, - auto_validate = false + auto_validate = false, }, }, }) diff --git a/dots/.config/nvim/lua/plugins/configs/treesitter.lua b/dots/.config/nvim/lua/plugins/configs/treesitter.lua index 27ff57a1..49ee6b44 100644 --- a/dots/.config/nvim/lua/plugins/configs/treesitter.lua +++ b/dots/.config/nvim/lua/plugins/configs/treesitter.lua @@ -126,7 +126,7 @@ return { "RRethy/nvim-treesitter-endwise", }, config = function() - local parser_config = require('nvim-treesitter.parsers').get_parser_configs() + local parser_config = require("nvim-treesitter.parsers").get_parser_configs() parser_config.typst = { install_info = { url = "https://github.com/uben0/tree-sitter-typst", @@ -135,7 +135,7 @@ return { generate_requires_npm = true, }, maintainers = { "uben0" }, - experimental = true + experimental = true, } require("nvim-treesitter.configs").setup({ auto_install = true, diff --git a/dots/.config/nvim/lua/plugins/configs/typst.lua b/dots/.config/nvim/lua/plugins/configs/typst.lua index 986f98ad..dd66d567 100644 --- a/dots/.config/nvim/lua/plugins/configs/typst.lua +++ b/dots/.config/nvim/lua/plugins/configs/typst.lua @@ -2,6 +2,8 @@ return { { "chomosuke/typst-preview.nvim", ft = "typst", - build = function() require("typst-preview").update() end, - } + build = function() + require("typst-preview").update() + end, + }, }