diff --git a/lua/assets/icons.lua b/lua/assets/icons.lua new file mode 100644 index 0000000..15ffb90 --- /dev/null +++ b/lua/assets/icons.lua @@ -0,0 +1,74 @@ +local M = {} + +M.icons = { + misc = { + dots = "󰇘", + }, + ft = { + octo = " ", + gh = " ", + ["markdown.gh"] = " ", + }, + dap = { + Stopped = { "󰁕 ", "DiagnosticWarn", "DapStoppedLine" }, + Breakpoint = " ", + BreakpointCondition = " ", + BreakpointRejected = { " ", "DiagnosticError" }, + LogPoint = ".>", + }, + diagnostics = { + Error = " ", + Warn = " ", + Hint = " ", + Info = " ", + }, + git = { + added = " ", + modified = " ", + removed = " ", + }, + kinds = { + Array = " ", + Boolean = "󰨙 ", + Class = " ", + Codeium = "󰘦 ", + Color = " ", + Control = " ", + Collapsed = " ", + Constant = "󰏿 ", + Constructor = " ", + Copilot = " ", + Enum = " ", + EnumMember = " ", + Event = " ", + Field = " ", + File = " ", + Folder = " ", + Function = "󰊕 ", + Interface = " ", + Key = " ", + Keyword = " ", + Method = "󰊕 ", + Module = " ", + Namespace = "󰦮 ", + Null = " ", + Number = "󰎠 ", + Object = " ", + Operator = " ", + Package = " ", + Property = " ", + Reference = " ", + Snippet = "󱄽 ", + String = " ", + Struct = "󰆼 ", + Supermaven = " ", + TabNine = "󰏚 ", + Text = " ", + TypeParameter = " ", + Unit = " ", + Value = " ", + Variable = "󰀫 ", + }, +} + +return M diff --git a/lua/config/gitsigns.lua b/lua/config/gitsigns.lua new file mode 100644 index 0000000..30b923b --- /dev/null +++ b/lua/config/gitsigns.lua @@ -0,0 +1,51 @@ +local icons = require("assets.icons").icons + +require('gitsigns').setup { + signs = { + add = { text = icons.git.added }, + change = { text = icons.git.modified }, + delete = { text = icons.git.removed }, + topdelete = { text = icons.git.removed }, + changedelete = { text = icons.git.modified }, + untracked = { text = '┆' }, + }, + signs_staged = { + add = { text = icons.git.added }, + change = { text = icons.git.modified }, + delete = { text = icons.git.removed }, + topdelete = { text = icons.git.removed }, + changedelete = { text = icons.git.modified }, + untracked = { text = '┆' }, + }, + signs_staged_enable = true, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + watch_gitdir = { + follow_files = true + }, + auto_attach = true, + attach_to_untracked = false, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 1000, + ignore_whitespace = false, + virt_text_priority = 100, + use_focus = true, + }, + current_line_blame_formatter = ', - ', + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, -- Disable if file is longer than this (in lines) + preview_config = { + -- Options passed to nvim_open_win + style = 'minimal', + relative = 'cursor', + row = 0, + col = 1 + }, +} diff --git a/lua/config/treesitter.lua b/lua/config/treesitter.lua index f8a705c..785a166 100644 --- a/lua/config/treesitter.lua +++ b/lua/config/treesitter.lua @@ -3,14 +3,14 @@ local treesitter = require "nvim-treesitter" treesitter.install { "all" } vim.api.nvim_create_autocmd("FileType", { - callback = function(args) - local has_parser = pcall(vim.treesitter.get_parser, args.buf) + callback = function(args) + local has_parser = pcall(vim.treesitter.get_parser, args.buf) - if not has_parser then - return - end + if not has_parser then + return + end - vim.treesitter.start() - vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" - end, + vim.treesitter.start() + vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" + end, }) diff --git a/lua/plugins/glowy.lua b/lua/plugins/LOKS.lua similarity index 100% rename from lua/plugins/glowy.lua rename to lua/plugins/LOKS.lua diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua new file mode 100644 index 0000000..3d78c66 --- /dev/null +++ b/lua/plugins/git.lua @@ -0,0 +1,8 @@ +return { + { + "lewis6991/gitsigns.nvim", + config = function() + require("config.gitsigns") + end + } +}