diff --git a/lua/ward/init.lua b/lua/ward/init.lua index 958e056..1d62c33 100644 --- a/lua/ward/init.lua +++ b/lua/ward/init.lua @@ -10,7 +10,7 @@ require("ward.lazy") --$ Neovide configuration if used if vim.g.neovide then - vim.g.neovide_opacity = 0.7 - vim.g.neovide_window_blurred = true - vim.o.guifont = "Source Code Pro:h14" + vim.g.neovide_opacity = 0.7 + vim.g.neovide_window_blurred = true + vim.o.guifont = "Source Code Pro:h14" end diff --git a/lua/ward/plugins/mason.lua b/lua/ward/plugins/mason.lua index ce8b95f..5cb0455 100644 --- a/lua/ward/plugins/mason.lua +++ b/lua/ward/plugins/mason.lua @@ -2,18 +2,17 @@ --$ URL: https://github.com/williamboman/mason.nvim --$ :Mason return { - "williamboman/mason.nvim", - - config = function() - require("mason").setup() - end, - - opts = { - ensure_installed = { - --C / C++ - "clangd", - "clang-format", - "codelldb", + { + "mason-org/mason-lspconfig.nvim", + opts = {}, + dependencies = { + { + "williamboman/mason.nvim", + config = function() + require("mason").setup() + end, + }, + "neovim/nvim-lspconfig", }, }, } diff --git a/lua/ward/plugins/nvim-tree.lua b/lua/ward/plugins/nvim-tree.lua index 5c4b9b7..5f73f8b 100644 --- a/lua/ward/plugins/nvim-tree.lua +++ b/lua/ward/plugins/nvim-tree.lua @@ -21,6 +21,6 @@ return { }, }) vim.keymap.set("n", "e", vim.cmd.NvimTreeToggle) - vim.api.nvim_create_autocmd({"QuitPre"}, { callback = function() vim.cmd("NvimTreeClose") end, }) + vim.api.nvim_create_autocmd({ "QuitPre" }, { callback = function() vim.cmd("NvimTreeClose") end, }) end, } diff --git a/lua/ward/plugins/statusline.lua b/lua/ward/plugins/statusline.lua index 02510c8..fe002a1 100644 --- a/lua/ward/plugins/statusline.lua +++ b/lua/ward/plugins/statusline.lua @@ -1,16 +1,16 @@ return { - -- The bar at the bottom - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, + -- The bar at the bottom + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - require("lualine").setup({ - options = { - globalstatus = true, -- enable global statusline (have a single statusline - }, - sections = { - lualine_x = { "filetype" }, - }, - }) - end, + config = function() + require("lualine").setup({ + options = { + globalstatus = true, -- enable global statusline (have a single statusline + }, + sections = { + lualine_x = { "filetype" }, + }, + }) + end, } diff --git a/lua/ward/plugins/toggleterm.lua b/lua/ward/plugins/toggleterm.lua index 6126ceb..2f18f58 100644 --- a/lua/ward/plugins/toggleterm.lua +++ b/lua/ward/plugins/toggleterm.lua @@ -1,7 +1,7 @@ --$ adds a toggelable terminal --$ URL: https://github.com/akinsho/toggleterm.nvim --$ :help toggleterm -return{ +return { 'akinsho/toggleterm.nvim', version = "*", diff --git a/lua/ward/plugins/which-key.lua b/lua/ward/plugins/which-key.lua index a3be858..e5edac5 100644 --- a/lua/ward/plugins/which-key.lua +++ b/lua/ward/plugins/which-key.lua @@ -21,33 +21,33 @@ return { --# Structure of my standard keys local wk = require("which-key") wk.add({ - {"w", desc = "Write"}, - {"q", desc = "Quit"}, - {"e", desc = "Explore"}, - {"", desc = "Switch window"}, - {"n", desc = "Next buffer"}, - {"b", group = "Buffers"}, -- group - {"bn", desc = "Next buffer"}, - {"bp", desc = "Pervious buffer"}, - {"bb", desc = "Pervious buffer"}, - {"bl", desc = "Buffer list"}, - {"bc", desc = "Close buffer"}, - {"t", group = "Terminal"}, + { "w", desc = "Write" }, + { "q", desc = "Quit" }, + { "e", desc = "Explore" }, + { "", desc = "Switch window" }, + { "n", desc = "Next buffer" }, + { "b", group = "Buffers" }, -- group + { "bn", desc = "Next buffer" }, + { "bp", desc = "Pervious buffer" }, + { "bb", desc = "Pervious buffer" }, + { "bl", desc = "Buffer list" }, + { "bc", desc = "Close buffer" }, + { "t", group = "Terminal" }, -- {"tt", desc = "Bottom Terminal"}, -- {"tv", desc = "Vertical Terminal"}, -- {"tf", desc = "Floating Terminal"}, - {"p", group = "Project"}, - {"pf", desc = "Find file"}, - {"pg", desc = "Git files"}, - {"ps", desc = "Grep string search"}, - {"pw", desc = "Grep word search"}, - {"pW", desc = "Grep WORD search"}, - {"v", group = "Vim"}, - {"vh", desc = "Help search" }, - {"vm", "marks", desc = "Marks", }, - {"vr", "registers", desc = "Registers" }, - {"h", "nohlsearch", desc = "Stop Highlight" }, - {"l", group = "LSP"}, + { "p", group = "Project" }, + { "pf", desc = "Find file" }, + { "pg", desc = "Git files" }, + { "ps", desc = "Grep string search" }, + { "pw", desc = "Grep word search" }, + { "pW", desc = "Grep WORD search" }, + { "v", group = "Vim" }, + { "vh", desc = "Help search" }, + { "vm", "marks", desc = "Marks", }, + { "vr", "registers", desc = "Registers" }, + { "h", "nohlsearch", desc = "Stop Highlight" }, + { "l", group = "LSP" }, }) end, } diff --git a/lua/ward/remap.lua b/lua/ward/remap.lua index 5599588..144fd03 100644 --- a/lua/ward/remap.lua +++ b/lua/ward/remap.lua @@ -20,7 +20,7 @@ vim.keymap.set("n", "h", "nohlsearch") --"$ map exit terminal mode to Escape vim.keymap.set("t", "", [[]]) ---"$ normal mappings +--"$ normal mappings --"$ up/down half a page centered vim.keymap.set("n", "", [[zz]]) vim.keymap.set("n", "", [[zz]]) diff --git a/lua/ward/setup.lua b/lua/ward/setup.lua index b90da4b..600d60b 100644 --- a/lua/ward/setup.lua +++ b/lua/ward/setup.lua @@ -1,9 +1,9 @@ -vim.g.have_nerd_font = true -- use nerd_font +vim.g.have_nerd_font = true -- use nerd_font vim.opt.clipboard = "unnamedplus" -- use system keyboard for yank -vim.opt.nu = true -- set line numbers -vim.opt.relativenumber = true -- use relative line numbers +vim.opt.nu = true -- set line numbers +vim.opt.relativenumber = true -- use relative line numbers -- set tab size to 2 spaces vim.opt.tabstop = 2 @@ -25,8 +25,9 @@ vim.opt.termguicolors = true -- Sets colors to line numbers Above, Current and Below in this order function LineNumberColors() - vim.api.nvim_set_hl(0, "LineNrAbove", { fg = "#51B3EC", bold = true }) - vim.api.nvim_set_hl(0, "LineNr", { fg = "white", bold = true }) - vim.api.nvim_set_hl(0, "LineNrBelow", { fg = "#FB508F", bold = true }) + vim.api.nvim_set_hl(0, "LineNrAbove", { fg = "#51B3EC", bold = true }) + vim.api.nvim_set_hl(0, "LineNr", { fg = "white", bold = true }) + vim.api.nvim_set_hl(0, "LineNrBelow", { fg = "#FB508F", bold = true }) end + LineNumberColors()