Add diff colors, change fugitive keybindings
This commit is contained in:
parent
22719ae09b
commit
ff062d4fa9
4 changed files with 7 additions and 6 deletions
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -13,17 +13,17 @@ autocmd("BufWinEnter", {
|
|||
|
||||
local bufnr = vim.api.nvim_get_current_buf()
|
||||
local opts = {buffer = bufnr, remap = false}
|
||||
vim.keymap.set("n", "<leader>p", function()
|
||||
vim.keymap.set("n", "<leader>gp", function()
|
||||
vim.cmd.Git('push')
|
||||
end, opts)
|
||||
|
||||
-- rebase always
|
||||
vim.keymap.set("n", "<leader>P", function()
|
||||
vim.keymap.set("n", "<leader>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", "<leader>t", ":Git push -u origin ", opts);
|
||||
vim.keymap.set("n", "<leader>gt", ":Git push -u origin ", opts);
|
||||
end,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
1
init.lua
1
init.lua
|
|
@ -1,2 +1 @@
|
|||
require("default")
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue