diff --git a/lua/config/init.lua b/lua/config/init.lua index dba6f48..bcf9221 100644 --- a/lua/config/init.lua +++ b/lua/config/init.lua @@ -2,10 +2,10 @@ vim.wo.number = true -- Line numbers vim.wo.relativenumber = true vim.opt.wrap = false -vim.opt.mouse = "a" -- enable mouse mode for window resizing +vim.opt.mouse = "a" -- enable mouse mode for window resizing vim.opt.clipboard = "unnamedplus" -- share system and nvim clipboard vim.g.have_nerd_font = true -vim.opt.undofile = true -- Save undo history +vim.opt.undofile = true -- Save undo history -- Add shell-specific settings local shell_path = os.getenv("SHELL") or "" @@ -18,7 +18,7 @@ if (vim.fn.executable("nu") == 1) and shell_path:find("nu") then vim.opt.shellxquote = "" vim.opt.shellquote = "" vim.opt.shellpipe = - "| complete | update stderr { ansi strip } | tee { get stderr | save --force --raw %s } | into record" + "| complete | update stderr { ansi strip } | tee { get stderr | save --force --raw %s } | into record" end -- Add custom commentstring definitions vim.api.nvim_create_autocmd("FileType", { @@ -61,8 +61,8 @@ vim.opt.smartindent = true vim.opt.expandtab = true vim.opt.smarttab = true vim.opt.inccommand = "split" -- Preview substitutions live, as you type! -vim.opt.cursorline = true -- Show which line your cursor is on -vim.opt.scrolloff = 4 -- Minimal number of screen lines to keep above and below the cursor. +vim.opt.cursorline = true -- Show which line your cursor is on +vim.opt.scrolloff = 4 -- Minimal number of screen lines to keep above and below the cursor. -- Set highlight on search, but clear on pressing in normal mode vim.opt.hlsearch = true diff --git a/lua/config/keys.lua b/lua/config/keys.lua index 7bf3f0e..3e28d10 100644 --- a/lua/config/keys.lua +++ b/lua/config/keys.lua @@ -79,21 +79,21 @@ return { }, globals = { -- Window Navigation - { "", "h", desc = "Window Left" }, - { "", "j", desc = "Window Down" }, - { "", "k", desc = "Window Up" }, - { "", "l", desc = "Window Right" }, + { "", "h", desc = "Window Left" }, + { "", "j", desc = "Window Down" }, + { "", "k", desc = "Window Up" }, + { "", "l", desc = "Window Right" }, -- Window Resizing - { "", "+", desc = "Resize Increase Height" }, - { "", "-", desc = "Resize Decrease Height" }, - { "", ">", desc = "Resize Increase Width" }, - { "", "<", desc = "Resize Decrease Width" }, + { "", "+", desc = "Resize Increase Height" }, + { "", "-", desc = "Resize Decrease Height" }, + { "", ">", desc = "Resize Increase Width" }, + { "", "<", desc = "Resize Decrease Width" }, -- Splits - { "", "s", desc = "Split Window Horizontal" }, - { "", "x", desc = "Swap Window" }, - { "", ":q", desc = "Close Window" }, + { "", "s", desc = "Split Window Horizontal" }, + { "", "x", desc = "Swap Window" }, + { "", ":q", desc = "Close Window" }, -- Misc - { "", "nohlsearch", desc = "Clear Highlight" }, + { "", "nohlsearch", desc = "Clear Highlight" }, { "dd", vim.diagnostic.open_float, desc = "Show [D]iagnostics" }, }, harpoon = { @@ -174,45 +174,59 @@ return { }, }, lsp = { - { "K", vim.lsp.buf.hover, desc = "[K] Hover Documentation" }, + { "K", vim.lsp.buf.hover, desc = "[K] Hover Documentation" }, { "gd", - function() require("telescope.builtin").lsp_definitions() end, - desc = "[G]oto [D]efinition" + function() + require("telescope.builtin").lsp_definitions() + end, + desc = "[G]oto [D]efinition", }, { "ge", vim.lsp.buf.declaration, desc = "[G]oto D[e]claration" }, { "gi", - function() require("telescope.builtin").lsp_implementations() end, - desc = "[G]oto [I]mplementation" + function() + require("telescope.builtin").lsp_implementations() + end, + desc = "[G]oto [I]mplementation", }, { "gr", - function() require("telescope.builtin").lsp_references() end, - desc = "[G]oto [R]eferences" + function() + require("telescope.builtin").lsp_references() + end, + desc = "[G]oto [R]eferences", }, { "gt", - function() require("telescope.builtin").lsp_type_definitions() end, - desc = "[G]oto [T]ype" + function() + require("telescope.builtin").lsp_type_definitions() + end, + desc = "[G]oto [T]ype", }, { "ss", - function() require("telescope.builtin").lsp_document_symbols() end, - desc = "[S]earch [S]ymbols" + function() + require("telescope.builtin").lsp_document_symbols() + end, + desc = "[S]earch [S]ymbols", }, { "ws", - function() require("telescope.builtin").lsp_dynamic_workspace_symbols() end, - desc = "[W]orkspace [S]ymbols" + function() + require("telescope.builtin").lsp_dynamic_workspace_symbols() + end, + desc = "[W]orkspace [S]ymbols", }, - { "r", vim.lsp.buf.rename, desc = "[R]ename" }, + { "r", vim.lsp.buf.rename, desc = "[R]ename" }, { "ca", vim.lsp.buf.code_action, desc = "[C]ode [A]ction" }, - { "f", vim.lsp.buf.format, desc = "[F]ormat" }, + { "f", vim.lsp.buf.format, desc = "[F]ormat" }, { "ci", - function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) end, - desc = "[I]nlay Hints" + function() + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) + end, + desc = "[I]nlay Hints", }, }, neogen = { @@ -277,10 +291,10 @@ return { { "te", vim.cmd.Oil, desc = "[T]ree [E]dit", mode = "n" }, }, overseer = { - { "ob", vim.cmd.OverseerBuild, desc = "[O]verseer [B]uild", mode = "n" }, + { "ob", vim.cmd.OverseerBuild, desc = "[O]verseer [B]uild", mode = "n" }, { "oc", vim.cmd.OverseerRunCmd, desc = "[O]verseer Run [C]ommand", mode = "n" }, - { "or", vim.cmd.OverseerRun, desc = "[O]verseer [R]un", mode = "n" }, - { "ot", vim.cmd.OverseerToggle, desc = "[O]verseer [T]oggle", mode = "n" }, + { "or", vim.cmd.OverseerRun, desc = "[O]verseer [R]un", mode = "n" }, + { "ot", vim.cmd.OverseerToggle, desc = "[O]verseer [T]oggle", mode = "n" }, }, precognition = { { @@ -424,7 +438,7 @@ return { "Trouble todo toggle filter = {tag = {TODO,FIX,FIXME}}", desc = "Todo/Fix/Fixme", }, - { "st", "TodoTelescope", desc = "Todo" }, + { "st", "TodoTelescope", desc = "Todo" }, { "sT", "TodoTelescope keywords=TODO,FIX,FIXME", @@ -438,14 +452,14 @@ return { "Trouble diagnostics toggle filter.buf=0", desc = "Buffer Diagnostics", }, - { "cs", "Trouble symbols toggle", desc = "Symbols" }, + { "cs", "Trouble symbols toggle", desc = "Symbols" }, { "cS", "Trouble lsp toggle", desc = "LSP references/definitions/... (Trouble)", }, { "xL", "Trouble loclist toggle", desc = "Location List" }, - { "xQ", "Trouble qflist toggle", desc = "Quickfix List" }, + { "xQ", "Trouble qflist toggle", desc = "Quickfix List" }, { "[q", function() @@ -491,7 +505,7 @@ return { vim.notify("Rainbow Delimiters: OFF", vim.log.levels.INFO) end end, - desc = "Toggle Rainbow Delimiters" + desc = "Toggle Rainbow Delimiters", }, }, undotree = { diff --git a/lua/keybindings.lua b/lua/keybindings.lua index bd8dc85..8c7fc03 100644 --- a/lua/keybindings.lua +++ b/lua/keybindings.lua @@ -4,6 +4,6 @@ for _, map in ipairs(keys) do vim.keymap.set("n", map[1], map[2], { noremap = true, silent = true, - desc = map.desc + desc = map.desc, }) end diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua index 5aa36d1..72df0a9 100644 --- a/lua/plugins/completions.lua +++ b/lua/plugins/completions.lua @@ -13,14 +13,14 @@ return { preset = "super-tab", }, appearance = { - nerd_font_variant = "mono" + nerd_font_variant = "mono", }, completion = { documentation = { auto_show = true } }, sources = { default = { "lsp", "path", "snippets", "buffer" }, }, - fuzzy = { implementation = "prefer_rust_with_warning" } + fuzzy = { implementation = "prefer_rust_with_warning" }, }, - opts_extend = { "sources.default" } - } + opts_extend = { "sources.default" }, + }, } diff --git a/lua/plugins/extras.lua b/lua/plugins/extras.lua index 2c2799a..2ca5b7f 100644 --- a/lua/plugins/extras.lua +++ b/lua/plugins/extras.lua @@ -34,7 +34,10 @@ return { -- Non programming quality of life utilities go here path = fallback_path, }) - vim.notify("Obsidian: 'Work_Notes' not found. Using fallback path.", vim.log.levels.WARN) + vim.notify( + "Obsidian: 'Work_Notes' not found. Using fallback path.", + vim.log.levels.WARN + ) end return { diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index f07c64a..2619333 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -15,7 +15,7 @@ return { for _, map in ipairs(lsp_keys) do vim.keymap.set("n", map[1], map[2], { buffer = event.buf, - desc = "LSP: " .. map.desc + desc = "LSP: " .. map.desc, }) end @@ -55,6 +55,6 @@ return { }) end, }, - { "fladson/vim-kitty", ft = "kitty" }, + { "fladson/vim-kitty", ft = "kitty" }, { "scallop-lang/vim-scallop", ft = "scallop" }, } diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua index 7c324e1..ae0ae07 100644 --- a/lua/plugins/mini.lua +++ b/lua/plugins/mini.lua @@ -1,5 +1,5 @@ return { -- Mini is so varied it's hard to categorise. So i dumped my mini installs here - { -- Collection of various small independent plugins/modules + { -- Collection of various small independent plugins/modules "echasnovski/mini.nvim", config = function() -- Better Around/Inside textobjects diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index d56510a..2bc8609 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,5 +1,5 @@ return { -- UI components and other visual elements are declared here - { -- Theme + { -- Theme "folke/tokyonight.nvim", lazy = false, priority = 1000, @@ -133,5 +133,5 @@ return { -- UI components and other visual elements are declared here config = function() require("rainbow-delimiters.setup").setup() end, - } + }, } diff --git a/lua/plugins/utils.lua b/lua/plugins/utils.lua index 1fd180b..7dd0bec 100644 --- a/lua/plugins/utils.lua +++ b/lua/plugins/utils.lua @@ -23,7 +23,7 @@ return { -- General programming utilities go here }, }, -- Privilege escalation plugin - { "lambdalisue/suda.vim", event = "VeryLazy" }, + { "lambdalisue/suda.vim", event = "VeryLazy" }, { "folke/trouble.nvim", cmd = { "Trouble" },