my neovim configuration

conflict

Changed files
+31 -38
lua
+4 -4
lua/ptero/configs/gitsigns.lua
···
signs = {
add = {
hl = "GitSignsAdd",
-
text = icons.ui.BoldLineLeft,
+
text = icons.git.LineAdded,
numhl = "GitSignsAddNr",
linehl = "GitSignsAddLn",
},
change = {
hl = "GitSignsChange",
-
text = icons.ui.BoldLineLeft,
+
text = icons.git.LineModified,
numhl = "GitSignsChangeNr",
linehl = "GitSignsChangeLn",
},
delete = {
hl = "GitSignsDelete",
-
text = icons.ui.Triangle,
+
text = icons.git.LineRemoved,
numhl = "GitSignsDeleteNr",
linehl = "GitSignsDeleteLn",
},
···
},
untracked = {
hl = "GitSignsAdd",
-
text = icons.ui.BoldLineDotted,
+
text = icons.git.LineDeleted,
numhl = "GitSignsAddNr",
linehl = "GitSignsAddLn",
},
+25 -25
lua/ptero/icons.lua
···
return {
kind = {
-
Text = "",
-
Method = "",
-
Function = "",
-
Constructor = "",
-
Field = "ﰠ",
-
Variable = "",
-
Class = "ﴯ",
-
Interface = "",
-
Module = "",
-
Property = "ﰠ",
-
Unit = "塞",
-
Value = "",
-
Enum = "",
-
Keyword = "",
-
Snippet = "",
-
Color = "",
-
File = "",
-
Reference = "",
-
Folder = "",
-
EnumMember = "",
-
Constant = "",
-
Struct = "פּ",
-
Event = "",
-
Operator = "",
-
TypeParameter = "",
+
Text = "t",
+
Method = "m",
+
Function = "f",
+
Constructor = "c",
+
Field = "F",
+
Variable = "v",
+
Class = "c",
+
Interface = "i",
+
Module = "m",
+
Property = "p",
+
Unit = "u",
+
Value = "v",
+
Enum = "e",
+
Keyword = "k",
+
Snippet = "s",
+
Color = "c",
+
File = "f",
+
Reference = "r",
+
Folder = "d",
+
EnumMember = "e",
+
Constant = "c",
+
Struct = "s",
+
Event = "e",
+
Operator = "o",
+
TypeParameter = "t",
},
git = {
LineAdded = "+",
+2 -9
lua/ptero/plugins.lua
···
local utils = require("ptero/utils")
require("lazy").setup({
+
{ "catppuccin/nvim", name = "catppuccin", priority = 1000 },
+
-- better notifications
{
"rcarriga/nvim-notify",
···
},
"nvim-lua/plenary.nvim",
-
-
-- color scheme
-
{"catppuccin/nvim", name="catppuccin"},
-- pretty colors for viewing code
{
···
dependencies = {
"williamboman/mason-lspconfig.nvim"
}
-
},
-
-
-- Dashboard
-
{
-
"echasnovski/mini.starter",
-
config=function() require('ptero.configs.starter') end,
},
-- visual keybindings