mirror of
https://github.com/Cian-H/my_nvim_config.git
synced 2025-12-22 20:21:57 +00:00
Replaced fugitive and signify with gitsigns
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
return { -- UI components and other visual elements are declared here
|
||||
{ -- Theme
|
||||
{ -- Theme
|
||||
"folke/tokyonight.nvim",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
@@ -60,26 +60,6 @@ return { -- UI components and other visual elements are declared here
|
||||
require("window-picker").setup()
|
||||
end,
|
||||
},
|
||||
{ -- Adds git related signs to the gutter, as well as utilities for managing changes
|
||||
"mhinz/vim-signify",
|
||||
event = "VimEnter",
|
||||
config = function()
|
||||
-- defer config for 5ms. Old vim plugins can be janky in neovim
|
||||
vim.defer_fn(function()
|
||||
vim.g.signify_sign_show_count = 0
|
||||
vim.g.signify_sign_add = "┃"
|
||||
vim.g.signify_sign_change = "┃"
|
||||
vim.g.signify_sign_delete = "_"
|
||||
vim.g.signify_sign_delete_first_line = "‾"
|
||||
vim.g.signify_sign_change_delete = "~"
|
||||
vim.cmd.highlight({ "SignifySignAdd", "guifg=#449dab" })
|
||||
vim.cmd.highlight({ "SignifySignChange", "guifg=#6183bb" })
|
||||
vim.cmd.highlight({ "SignifySignDelete", "guifg=#914c54" })
|
||||
vim.cmd.highlight({ "link", "SignifySignDeleteFirstLine", "SignifySignDelete" })
|
||||
vim.cmd.highlight({ "link", "SignifySignChangeDelete", "SignifySignChange" })
|
||||
end, 5)
|
||||
end,
|
||||
},
|
||||
-- Modular, configurable status bar
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
return { -- General programming utilities go here
|
||||
-- Tools for configuration and plugin development
|
||||
{ "folke/neoconf.nvim", cmd = "Neoconf" },
|
||||
{ "folke/neoconf.nvim", cmd = "Neoconf" },
|
||||
{
|
||||
"folke/neodev.nvim",
|
||||
opts = {
|
||||
@@ -8,7 +8,7 @@ return { -- General programming utilities go here
|
||||
if
|
||||
root_dir:find(
|
||||
os.getenv("XDG_CONFIG_HOME")
|
||||
.. "/nix/home-manager/core/dotfiles/dot_config/nvim/",
|
||||
.. "/nix/home-manager/core/dotfiles/dot_config/nvim/",
|
||||
1,
|
||||
true
|
||||
) == 1
|
||||
@@ -40,9 +40,24 @@ return { -- General programming utilities go here
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
keys = require("config.keys").todo_comments,
|
||||
},
|
||||
"tpope/vim-fugitive", -- Also want to add fugitive, since it's apparently a great git plugin
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
event = "VimEnter",
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
config = function()
|
||||
require("gitsigns").setup({
|
||||
signs = {
|
||||
add = { text = "┃" },
|
||||
change = { text = "┃" },
|
||||
delete = { text = "_" },
|
||||
topdelete = { text = "‾" },
|
||||
changedelete = { text = "~" },
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
"jlfwong/vim-mercenary", -- Mercenary is the mercurial equivalent of fugitive
|
||||
{ -- Oil is a very nice buffer-based filetree editor
|
||||
{ -- Oil is a very nice buffer-based filetree editor
|
||||
"stevearc/oil.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {},
|
||||
|
||||
Reference in New Issue
Block a user