my neovim configuration

conflict

+31 -38
+4 -4
lua/ptero/configs/gitsigns.lua
··· 8 8 signs = { 9 9 add = { 10 10 hl = "GitSignsAdd", 11 - text = icons.ui.BoldLineLeft, 11 + text = icons.git.LineAdded, 12 12 numhl = "GitSignsAddNr", 13 13 linehl = "GitSignsAddLn", 14 14 }, 15 15 change = { 16 16 hl = "GitSignsChange", 17 - text = icons.ui.BoldLineLeft, 17 + text = icons.git.LineModified, 18 18 numhl = "GitSignsChangeNr", 19 19 linehl = "GitSignsChangeLn", 20 20 }, 21 21 delete = { 22 22 hl = "GitSignsDelete", 23 - text = icons.ui.Triangle, 23 + text = icons.git.LineRemoved, 24 24 numhl = "GitSignsDeleteNr", 25 25 linehl = "GitSignsDeleteLn", 26 26 }, ··· 38 38 }, 39 39 untracked = { 40 40 hl = "GitSignsAdd", 41 - text = icons.ui.BoldLineDotted, 41 + text = icons.git.LineDeleted, 42 42 numhl = "GitSignsAddNr", 43 43 linehl = "GitSignsAddLn", 44 44 },
+25 -25
lua/ptero/icons.lua
··· 1 1 return { 2 2 kind = { 3 - Text = "", 4 - Method = "", 5 - Function = "", 6 - Constructor = "", 7 - Field = "ﰠ", 8 - Variable = "", 9 - Class = "ﴯ", 10 - Interface = "", 11 - Module = "", 12 - Property = "ﰠ", 13 - Unit = "塞", 14 - Value = "", 15 - Enum = "", 16 - Keyword = "", 17 - Snippet = "", 18 - Color = "", 19 - File = "", 20 - Reference = "", 21 - Folder = "", 22 - EnumMember = "", 23 - Constant = "", 24 - Struct = "פּ", 25 - Event = "", 26 - Operator = "", 27 - TypeParameter = "", 3 + Text = "t", 4 + Method = "m", 5 + Function = "f", 6 + Constructor = "c", 7 + Field = "F", 8 + Variable = "v", 9 + Class = "c", 10 + Interface = "i", 11 + Module = "m", 12 + Property = "p", 13 + Unit = "u", 14 + Value = "v", 15 + Enum = "e", 16 + Keyword = "k", 17 + Snippet = "s", 18 + Color = "c", 19 + File = "f", 20 + Reference = "r", 21 + Folder = "d", 22 + EnumMember = "e", 23 + Constant = "c", 24 + Struct = "s", 25 + Event = "e", 26 + Operator = "o", 27 + TypeParameter = "t", 28 28 }, 29 29 git = { 30 30 LineAdded = "+",
+2 -9
lua/ptero/plugins.lua
··· 14 14 local utils = require("ptero/utils") 15 15 16 16 require("lazy").setup({ 17 + { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, 18 + 17 19 -- better notifications 18 20 { 19 21 "rcarriga/nvim-notify", ··· 21 23 }, 22 24 23 25 "nvim-lua/plenary.nvim", 24 - 25 - -- color scheme 26 - {"catppuccin/nvim", name="catppuccin"}, 27 26 28 27 -- pretty colors for viewing code 29 28 { ··· 70 69 dependencies = { 71 70 "williamboman/mason-lspconfig.nvim" 72 71 } 73 - }, 74 - 75 - -- Dashboard 76 - { 77 - "echasnovski/mini.starter", 78 - config=function() require('ptero.configs.starter') end, 79 72 }, 80 73 81 74 -- visual keybindings