diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua index fe97b1b..b80d3a3 100644 --- a/after/plugin/colors.lua +++ b/after/plugin/colors.lua @@ -2,13 +2,15 @@ require('rose-pine').setup({ disable_background = true }) -function ColorMyPencils(color) +function ColorMyPencils(color) color = color or "rose-pine" vim.cmd.colorscheme(color) vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + vim.api.nvim_set_hl(0, "diffAdd", { bg = "#5bb899" }) + vim.api.nvim_set_hl(0, "diffDelete", { bg = "#db6c6c" }) end ColorMyPencils() diff --git a/after/plugin/fugitive.lua b/after/plugin/fugitive.lua index 118c635..38b68ff 100644 --- a/after/plugin/fugitive.lua +++ b/after/plugin/fugitive.lua @@ -13,17 +13,17 @@ autocmd("BufWinEnter", { local bufnr = vim.api.nvim_get_current_buf() local opts = {buffer = bufnr, remap = false} - vim.keymap.set("n", "p", function() + vim.keymap.set("n", "gp", function() vim.cmd.Git('push') end, opts) -- rebase always - vim.keymap.set("n", "P", function() + vim.keymap.set("n", "gP", function() vim.cmd.Git({'pull', '--rebase'}) end, opts) -- NOTE: It allows me to easily set the branch i am pushing and any tracking -- needed if i did not set the branch up correctly - vim.keymap.set("n", "t", ":Git push -u origin ", opts); + vim.keymap.set("n", "gt", ":Git push -u origin ", opts); end, }) diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua index dfaab76..2601e75 100644 --- a/after/plugin/lsp.lua +++ b/after/plugin/lsp.lua @@ -28,7 +28,7 @@ lsp.setup_nvim_cmp({ }) lsp.set_preferences({ - suggest_lsp_servers = false, + suggest_lsp_servers = true, sign_icons = { error = 'E', warn = 'W', diff --git a/init.lua b/init.lua index 4368918..2229d79 100644 --- a/init.lua +++ b/init.lua @@ -1,2 +1 @@ require("default") -