diff options
Diffstat (limited to '')
25 files changed, 81 insertions, 666 deletions
diff --git a/lua/core/overrides/cmp.lua b/after/plugin/cmp.lua index 5fbb2a5..f69fc43 100644 --- a/lua/core/overrides/cmp.lua +++ b/after/plugin/cmp.lua @@ -1,3 +1,36 @@ +local status_ok, cmp = pcall(require, "cmp") +if not status_ok then + return +end + +local lspicons = { + Text = 'Tx', + Snippet = '<>', + Method = '{}', + Function = '{}', + Constructor = '{}', + Field = '""', + Variable = 'x=', + Class = '{}', + Interface = '.h', + Module = '{}', + Property = '@p', + Unit = ' ', + Value = ' ', + Enum = 'E#', + Keyword = '$1', + Color = ' ', + File = '#`', + Reference = ' ', + Folder = '[/', + EnumMember = ' ', + Constant = 'c=', + Struct = ' ', + Event = ' ', + Operator = '%*', + TypeParameter = ' ', +} + local has_words_before = function() unpack = unpack or table.unpack local line, col = unpack(a.nvim_win_get_cursor(0)) @@ -5,7 +38,6 @@ local has_words_before = function() [1]:sub(col, col):match("%s") == nil end -local cmp = require('cmp') local luasnip = require('luasnip') require("luasnip.loaders.from_vscode").lazy_load() @@ -27,7 +59,7 @@ cmp.setup { window = { completion = { winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None", - col_offset = -3, + col_offset = 0, side_padding = 0, } }, @@ -58,7 +90,7 @@ cmp.setup { elseif has_words_before() then cmp.complete() else - fallback() + require("intellitab").indent() end end, { "i", "s" }), ["<S-Tab>"] = cmp.mapping(function(fallback) diff --git a/lua/core/overrides/colorizer.lua b/after/plugin/colorizer.lua index a18101e..830e1b9 100644 --- a/lua/core/overrides/colorizer.lua +++ b/after/plugin/colorizer.lua @@ -1,4 +1,9 @@ -require('colorizer').setup { +local status_ok, colorizer = pcall(require, "colorizer") +if not status_ok then + return +end + +colorizer.setup { filetypes = { '*' }, user_default_options = { names = false, diff --git a/lua/core/overrides/snip.lua b/after/plugin/luasnip.lua index c11236e..1374bc3 100644 --- a/lua/core/overrides/snip.lua +++ b/after/plugin/luasnip.lua @@ -1,6 +1,9 @@ -local ls = require('luasnip') +local status_ok, luasnip = pcall(require, "luasnip") +if not status_ok then + return +end -ls.config.set_config { +luasnip.config.set_config { -- return back into snippet history = true, diff --git a/lua/core/overrides/sfm.lua b/after/plugin/sfm.lua index 06c77d1..dcbbe95 100644 --- a/lua/core/overrides/sfm.lua +++ b/after/plugin/sfm.lua @@ -1,12 +1,18 @@ -local sfm = require('sfm') +local status_ok, sfm = pcall(require, "sfm") +if not status_ok then + return +end sfm.setup { view = { - side = "left", -- side of the tree, can be `left`, `right` - width = 30 + side = 'right', + width = 35, }, mappings = { custom_only = false, + list = { + -- user mappings go here + } }, renderer = { icons = { @@ -24,17 +30,17 @@ sfm.setup { folder_closed = "", folder_open = "", file = "", - }, + } } - }, + } }:load_extension('sfm-git', { icons = { - staged = "^", unstaged = "+", - unmerged = "", - renamed = ">", + staged = "S", + unmerged = "U", + renamed = "r", untracked = "?", - deleted = "x", - ignored = "#" + deleted = "-", + ignored = "?", } }) diff --git a/lua/core/overrides/telescope.lua b/after/plugin/telescope.lua index c17e56c..0674b21 100644 --- a/lua/core/overrides/telescope.lua +++ b/after/plugin/telescope.lua @@ -1,13 +1,20 @@ -local telescope = require('telescope') +local status_ok, telescope = pcall(require, "telescope") +if not status_ok then + return +end local actions = require('telescope.actions') telescope.setup { defaults = { - borderchars = { " ", " ", " ", " ", " ", " ", " ", " " }, + borderchars = { + prompt = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }; + results = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }; + preview = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }; + }, sorting_strategy = 'ascending', + layout_strategy = 'bottom_pane', layout_config = { - height = 0.9, - prompt_position = 'top', + height = 0.3, }, mappings = { i = { @@ -25,16 +32,16 @@ telescope.setup { }, extensions = { ["ui-select"] = { - require("telescope.themes").get_dropdown { + require("telescope.themes").get_ivy { -- even more opts } } }, } } -telescope.load_extension('undo') telescope.load_extension('file_browser') telescope.load_extension('ui-select') +telescope.load_extension('projects') a.nvim_create_autocmd('User', { pattern = 'TelescopePreviewerLoaded', diff --git a/lua/core/overrides/trouble.lua b/after/plugin/trouble.lua index eabbd7e..bdf9f37 100644 --- a/lua/core/overrides/trouble.lua +++ b/after/plugin/trouble.lua @@ -1,4 +1,9 @@ -require("trouble").setup { +local status_ok, trouble = pcall(require, "trouble") +if not status_ok then + return +end + +trouble.setup { icons = false, fold_open = "v", fold_closed = ">", diff --git a/lua/core/overrides/alpha.lua b/lua/core/overrides/alpha.lua deleted file mode 100644 index 373eeff..0000000 --- a/lua/core/overrides/alpha.lua +++ /dev/null @@ -1,260 +0,0 @@ -local present, alpha = pcall(require, "alpha") -if not present then - return -end - -local pepe = { - { - [[⠄⠄⠄⠄⠄⠄⠄⢀⣠⣶⣾⣿⣶⣦⣤⣀⠄⢀⣀⣤⣤⣤⣤⣄⠄⠄⠄⠄⠄⠄]], - [[⠄⠄⠄⠄⠄⢀⣴⣿⣿⣿⡿⠿⠿⠿⠿⢿⣷⡹⣿⣿⣿⣿⣿⣿⣷⠄⠄⠄⠄⠄]], - [[⠄⠄⠄⠄⠄⣾⣿⣿⣿⣯⣵⣾⣿⣿⡶⠦⠭⢁⠩⢭⣭⣵⣶⣶⡬⣄⣀⡀⠄⠄]], - [[⠄⠄⠄⡀⠘⠻⣿⣿⣿⣿⡿⠟⠩⠶⠚⠻⠟⠳⢶⣮⢫⣥⠶⠒⠒⠒⠒⠆⠐⠒]], - [[⠄⢠⣾⢇⣿⣿⣶⣦⢠⠰⡕⢤⠆⠄⠰⢠⢠⠄⠰⢠⠠⠄⡀⠄⢊⢯⠄⡅⠂⠄]], - [[⢠⣿⣿⣿⣿⣿⣿⣿⣏⠘⢼⠬⠆⠄⢘⠨⢐⠄⢘⠈⣼⡄⠄⠄⡢⡲⠄⠂⠠⠄]], - [[⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣥⣀⡁⠄⠘⠘⠘⢀⣠⣾⣿⢿⣦⣁⠙⠃⠄⠃⠐⣀]], - [[⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣋⣵⣾⣿⣿⣿⣿⣦⣀⣶⣾⣿⣿⡉⠉⠉]], - [[⣿⣿⣿⣿⣿⣿⣿⠟⣫⣥⣬⣭⣛⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡆⠄]], - [[⣿⣿⣿⣿⣿⣿⣿⠸⣿⣏⣙⠿⣿⣿⣶⣦⣍⣙⠿⠿⠿⠿⠿⠿⠿⠿⣛⣩⣶⠄]], - [[⣛⣛⣛⠿⠿⣿⣿⣿⣮⣙⠿⢿⣶⣶⣭⣭⣛⣛⣛⣛⠛⠛⠻⣛⣛⣛⣛⣋⠁⢀]], - [[⣿⣿⣿⣿⣿⣶⣬⢙⡻⠿⠿⣷⣤⣝⣛⣛⣛⣛⣛⣛⣛⣛⠛⠛⣛⣛⠛⣡⣴⣿]], - [[⣛⣛⠛⠛⠛⣛⡑⡿⢻⢻⠲⢆⢹⣿⣿⣿⣿⣿⣿⠿⠿⠟⡴⢻⢋⠻⣟⠈⠿⠿]], - [[⣿⡿⡿⣿⢷⢤⠄⡔⡘⣃⢃⢰⡦⡤⡤⢤⢤⢤⠒⠞⠳⢸⠃⡆⢸⠄⠟⠸⠛⢿]], - [[⡟⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠁⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⢸]], - }, - { - [[⠄⠄⠄⠄⠄⠄⠄⠄⠄⣾⣿⣿⣿⣿⡄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄]], - [[⠄⠄⠄⠄⠄⠄⠄⠄⣼⣿⣿⣿⣿⣿⣿⣧⠄⠄⠄⠄⠄⣀⣀⠄⠄⠄⠄⠄⠄⠄]], - [[⠄⠄⠄⠄⠄⠄⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣧⠄⠄⠄⣾⠛⠛⣷⢀⣾⠟⠻⣦⠄]], - [[⠄⠄⠄⠄⠄⠄⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡀⠄⠄⢰⡿⠋⠄⠄⣠⡾⠋⠄]], - [[⠄⠄⠄⠄⠄⣰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡄⠄⣬⡄⠄⠄⠄⣭⡅⠄⠄]], - [[⠄⠄⠄⠄⢰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡆⠄⠄⠄⠄⠄⠄⠄⠄⠄]], - [[⠄⠄⠄⠄⢛⣛⣛⣛⣛⣛⣛⣛⣛⡛⢋⣉⣭⣭⣥⣬⣤⣤⣀⠄⠄⠄⠄⠄⠄⠄]], - [[⠄⠄⣴⣵⣿⣟⡉⣥⣶⣶⠶⠶⠬⣉⡂⠹⣟⡫⠽⠟⢒⣒⠒⠆⠄⠄⠄⠄⠄⠄]], - [[⠄⣼⣿⣿⣿⣿⣿⣶⣭⣃⡈⠄⠄⠘⠃⡰⢶⣶⣿⠏⠄⠄⠙⡛⠄⠄⠄⠄⠄⠄]], - [[⢰⣿⣿⣿⣿⣿⣿⣿⣯⣉⣉⣩⣭⣶⣿⡿⠶⠶⠶⠶⠶⠾⣋⠄⠄⠄⠄⠄⠄⠄]], - [[⢾⣿⣿⣿⣿⣿⣿⣿⢩⣶⣒⠒⠶⢖⣒⣚⡛⠭⠭⠭⠍⠉⠁⠄⠄⠄⣀⣀⡀⠄]], - [[⠘⢿⣿⣿⣿⣿⣿⣿⣧⣬⣭⣭⣭⣤⡤⠤⠶⠟⣋⣀⣀⡀⢀⣤⣾⠟⠋⠈⢳⠄]], - [[⣴⣦⡒⠬⠭⣭⣭⣭⣙⣛⠋⠭⡍⠁⠈⠙⠛⠛⠛⠛⢻⠛⠉⢻⠁⠄⠄⠄⢸⡀]], - [[⣿⣿⣿⣿⣷⣦⣤⠤⢬⢍⣼⣦⡾⠛⠄⠄⠄⠄⠄⠄⠈⡇⠄⢸⠄⠄⠄⢦⣄⣇]], - [[⣿⣿⡿⣋⣭⣭⣶⣿⣶⣿⣿⣿⠟⠛⠃⠄⠄⠄⠄⠄⢠⠃⠄⡜⠄⠄⠄⠔⣿⣿]], - }, - { - [[⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠔⠊⠉⠉⠉⠉⠉⠐⢦⡄⠄⠄⠄⠄⠄⠄⠄⠄]], - [[⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⡐⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠘⣆⠄⠄⠄⠄⠄⠄⠄]], - [[⠄⠄⠄⠄⠄⠄⠄⠄⢀⠖⠁⢀⣾⣆⡰⠶⡷⠶⣀⣾⣄⠄⠈⣆⠄⠄⠄⠄⠄⠄]], - [[⠄⠄⡄⠄⠠⢤⣤⠔⠃⠄⠄⠄⠄⠘⢧⣤⢣⣤⠋⠄⠄⠄⠄⠈⠣⢤⡠⠄⠄⠄]], - [[⠄⠄⠘⠦⡀⠄⠄⠄⠄⠄⠄⠄⢻⡟⠻⣿⣿⡿⠻⡟⠃⠄⠄⠄⠄⠄⠄⠄⡀⠞]], - [[⠄⠄⠄⠄⠉⢢⡀⠄⠄⠄⠄⠄⠄⠄⠄⠄⠁⠄⠄⠄⠄⠄⠄⠄⠄⠄⡠⠊⠄⠄]], - [[⠄⠄⠄⠄⠄⠄⠈⠢⣤⣤⣴⣶⡶⢶⣶⣶⣶⣆⢒⣤⣤⠄⢠⠤⠤⠚⠄⠄⠄⠄]], - [[⠄⠄⠄⠄⠄⢀⣠⣾⣿⣿⣿⣿⣎⢻⣿⠁⡀⣿⡎⣿⣿⣀⣃⠧⡀⠄⠄⠄⠄⠄]], - [[⠄⠄⣠⣶⣾⣿⣿⣿⣿⣿⣿⣿⡹⡼⢿⣠⠵⠿⣑⢿⣟⣛⠤⣩⡁⠄⠄⠄⠄⠄]], - [[⢠⣿⣿⣿⢏⡜⡻⣷⡽⣿⣷⣭⣿⣮⣽⣯⣽⣿⣿⣷⣤⣾⡿⠟⠃⠄⠄⠄⠄⠄]], - [[⠻⣿⣿⣿⣌⢷⣙⠾⠯⣒⡿⠭⣝⣛⣛⣛⣛⠛⠭⠭⠟⢣⠌⠄⠄⠄⠄⠄⠄⠄]], - [[⠄⠻⣿⣿⣿⣮⣟⠷⣦⣤⣝⣛⠲⠶⠶⠒⢂⣀⠠⠄⠐⠁⠄⠄⠄⠄⠄⠄⠄⠄]], - [[⠄⠄⠄⠙⠿⠿⢿⣿⡷⠶⠭⠭⠭⠵⠶⠒⠋⠉⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄]], - }, - { - [[⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿]], - [[⣿⣿⣿⣿⣿⣿⣿⠛⢩⣴⣶⣶⣶⣌⠙⠫⠛⢋⣭⣤⣤⣤⣤⡙⣿⣿⣿⣿⣿⣿]], - [[⣿⣿⣿⣿⣿⡟⢡⣾⣿⠿⣛⣛⣛⣛⣛⡳⠆⢻⣿⣿⣿⠿⠿⠷⡌⠻⣿⣿⣿⣿]], - [[⣿⣿⣿⣿⠏⣰⣿⣿⣴⣿⣿⣿⡿⠟⠛⠛⠒⠄⢶⣶⣶⣾⡿⠶⠒⠲⠌⢻⣿⣿]], - [[⣿⣿⠏⣡⢨⣝⡻⠿⣿⢛⣩⡵⠞⡫⠭⠭⣭⠭⠤⠈⠭⠒⣒⠩⠭⠭⣍⠒⠈⠛]], - [[⡿⢁⣾⣿⣸⣿⣿⣷⣬⡉⠁⠄⠁⠄⠄⠄⠄⠄⠄⠄⣶⠄⠄⠄⠄⠄⠄⠄⠄⢀]], - [[⢡⣾⣿⣿⣿⣿⣿⣿⣿⣧⡀⠄⠄⠄⠄⠄⠄⠄⢀⣠⣿⣦⣤⣀⣀⣀⣀⠄⣤⣾]], - [[⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣶⣶⡶⢇⣰⣿⣿⣟⠿⠿⠿⠿⠟⠁⣾⣿⣿]], - [[⣿⣿⣿⣿⣿⣿⣿⡟⢛⡛⠿⠿⣿⣧⣶⣶⣿⣿⣿⣿⣿⣷⣼⣿⣿⣿⣧⠸⣿⣿]], - [[⠘⢿⣿⣿⣿⣿⣿⡇⢿⡿⠿⠦⣤⣈⣙⡛⠿⠿⠿⣿⣿⣿⣿⠿⠿⠟⠛⡀⢻⣿]], - [[⠄⠄⠉⠻⢿⣿⣿⣷⣬⣙⠳⠶⢶⣤⣍⣙⡛⠓⠒⠶⠶⠶⠶⠖⢒⣛⣛⠁⣾⣿]], - [[⠄⠄⠄⠄⠄⠈⠛⠛⠿⠿⣿⣷⣤⣤⣈⣉⣛⣛⣛⡛⠛⠛⠿⠿⠿⠟⢋⣼⣿⣿]], - [[⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠈⠉⠉⣻⣿⣿⣿⣿⡿⠿⠛⠃⠄⠙⠛⠿⢿⣿]], - [[⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⢬⣭⣭⡶⠖⣢⣦⣀⠄⠄⠄⠄⢀⣤⣾⣿]], - [[⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⢰⣶⣶⣶⣾⣿⣿⣿⣿⣷⡄⠄⢠⣾⣿⣿⣿]], - }, -} - --- dynamic header padding -local fn = vim.fn -local marginTopPercent = 0.2 -local Padding = fn.max { 2, fn.floor(fn.winheight(0) * marginTopPercent) } - -local header = { - type = "text", - val = pepe[math.random(#pepe)], - opts = { - position = "center", - hl = "AlphaAscii", - }, -} - -local plugins = require('lazy').stats().count -local date = os.date("%d/%m/%y(%a)%X") - -math.randomseed(os.time()) -local id = math.random(10000000, 99999999) -local id1 = math.random(10000000, 99999999) -local id2 = math.random(10000000, 99999999) - -local chan = { - [[based!!!]], - [[in other words, 4chan is better because - everyone gets to be an idiot.]], - [[NOOOOOOO YOU CAN’T PUBLISH BENCHMARKS FOR - OUR ANCIENT OS]], - [[This is the beginning of the end. AI has - finally won. Tech is no longer a viable job.]], - [[And Wikipedia is bloat because of html, - mathml, rich text, etc. Using modern codecs - and a simpler form of wiki we could store - the entire "human knowledge-base" and plain - text references (books, papers, articles, - websites) inside a single μSD card]], - [[My arch install broke again]], - [[Why are stdout, stderr and stdin already - opened when I start my program? Who opened - them and what is he doing in my computer?]], - [[YES BOYCOTT! - SPREAD THIS MESSAGE - EVERYONE QUIT USING THE SITE, THEY CANNOT - IGNORE US ANYMORE. FROM THIS DAY ONWARDS - THEIR PRODUCT WILL NOT BE ABLE TO HOLD UP - WITHOUT US]], - [[COMPANY A BETTER THAN COMPANY B]], - [[Nah, ignore this anon. If you want to - REALLY learn programming, you need to - learn with punch cards. Once you've - got that under your belt, move on - up to assembly.]], -} -local phrase = chan[math.random(#chan)] - -local heading = { - type = "text", - val = " Anonymous " .. date .. " No." .. id .. " ", - opts = { - position = "center", - hl = "AlphaButtons", - }, -} - -local post_buttons = { - type = "text", - val = "They don't get it. For me, it's nvim. ", - opts = { - position = "center", - hl = "AlphaFooter", - }, -} - -local pre_foot = { - type = "text", - val = ">>" .. id2 .. "(OP) ", - opts = { - position = "center", - hl = "AlphaEmphasis", - }, -} - -local footer = { - type = "text", - val = " I've " .. plugins .. " plugins, it launches instantly kek.", - opts = { - position = "center", - hl = "AlphaFooter", - }, -} - -local pre_foot_2 = { - type = "text", - val = ">>" .. id1 .. " ", - opts = { - position = "center", - hl = "AlphaEmphasis", - }, -} - -local footer_2 = { - type = "text", - val = " " .. phrase, - opts = { - position = "left", - hl = "AlphaFooter", - }, -} - -local function button(sc, txt, keybind) - local sc_ = sc:gsub("%s", ""):gsub("SPC", "<leader>") - - local opts = { - position = "center", - text = txt, - shortcut = sc, - cursor = 0, - width = 44, - align_shortcut = "right", - hl_shortcut = "AlphaShortcuts", - hl = "AlphaHeader", - } - if keybind then - opts.keymap = { "n", sc_, keybind, { noremap = true, silent = true } } - end - - return { - type = "button", - val = txt, - on_press = function() - local key = vim.api.nvim_replace_termcodes(sc_, true, false, true) - vim.api.nvim_feedkeys(key, "normal", false) - end, - opts = opts, - } -end - -local buttons = { - type = "group", - val = { - button("LDR e", " >open new file", ":ene<CR>"), - button("LDR h", " >open oldfiles", ":Telescope oldfiles<CR>"), - button("LDR f", " >fuzzy search", ":Telescope find_files<CR>"), - button("LDR y", " >browse folders" , ":Telescope file_browser path=%:p:h<CR>"), - button("LDR /", " >regex search", ":Telescope live_grep<CR>"), - button("LDR u", " >update plugins", ":lua require('lazy').update()<CR>"), - }, - opts = { - spacing = 0, - }, -} - -local section = { - header = header, - buttons = buttons, - heading = heading, - post_buttons = post_buttons, - pre_foot = pre_foot, - footer = footer, - pre_foot_2 = pre_foot_2, - footer_2 = footer_2, -} - -local opts = { - layout = { - { type = "padding", val = Padding}, - { type = "padding", val = 1 }, - section.header, - { type = "padding", val = 1 }, - section.heading, - { type = "padding", val = 1 }, - section.buttons, - section.post_buttons, - { type = "padding", val = 1 }, - section.pre_foot, - section.footer, - { type = "padding", val = 1 }, - section.pre_foot_2, - section.footer_2, - { type = "padding", val = Padding }, - }, - opts = { - margin = 50, - }, -} -alpha.setup(opts) diff --git a/lua/core/overrides/cmpluasnipchoice.lua b/lua/core/overrides/cmpluasnipchoice.lua deleted file mode 100644 index 52aa759..0000000 --- a/lua/core/overrides/cmpluasnipchoice.lua +++ /dev/null @@ -1,3 +0,0 @@ -require('cmp_luasnip_choice').setup { - auto_open = true, -} diff --git a/lua/core/overrides/hover.lua b/lua/core/overrides/hover.lua deleted file mode 100644 index 9e8a684..0000000 --- a/lua/core/overrides/hover.lua +++ /dev/null @@ -1,18 +0,0 @@ -require("hover").setup { - init = function() - -- Require providers - require("hover.providers.lsp") - -- require('hover.providers.gh') - -- require('hover.providers.gh_user') - -- require('hover.providers.jira') - require('hover.providers.man') - require('hover.providers.dictionary') - end, - preview_opts = { - border = 'single' - }, - -- Whether the contents of a currently open hover window should be moved - -- to a :h preview-window when pressing the hover keymap. - preview_window = true, - title = true -} diff --git a/lua/core/overrides/indentblankline.lua b/lua/core/overrides/indentblankline.lua deleted file mode 100644 index 0e43c22..0000000 --- a/lua/core/overrides/indentblankline.lua +++ /dev/null @@ -1,22 +0,0 @@ -if copts.tablines == 'colored' then - require("indent_blankline").setup { - space_char_blankline = ' ', - char_highlight_list = { - 'IndentBlanklineIndent1', - 'IndentBlanklineIndent2', - 'IndentBlanklineIndent3', - 'IndentBlanklineIndent4', - 'IndentBlanklineIndent5', - 'IndentBlanklineIndent6', - }, - } -elseif copts.tablines == 'wrap' then - o.list = true - require('indent_blankline').setup { - space_char_blankline = ' ', - show_current_context = true, - show_current_context_start = true, - } -else - g.indent_blankline_char = ' ' -end diff --git a/lua/core/overrides/init.lua b/lua/core/overrides/init.lua deleted file mode 100644 index 34df01f..0000000 --- a/lua/core/overrides/init.lua +++ /dev/null @@ -1,24 +0,0 @@ -require('core.overrides.indentblankline') -require('core.overrides.lualine') -require('core.overrides.telescope') -require('core.overrides.modicator') -require('core.overrides.neorg') -require('core.overrides.whichkey') -require('core.overrides.neoclip') -require('core.overrides.smartsplits') -require('core.overrides.treesitter') -require('core.overrides.treesj') -require('core.overrides.colorizer') -require('core.overrides.trouble') -require('core.overrides.lspzero') -require('core.overrides.cmp') -require('core.overrides.snip') -require('core.overrides.lspkind') -require('core.overrides.cmpluasnipchoice') -require('core.overrides.truezen') -require('core.overrides.alpha') -require('core.overrides.notify') -require('core.overrides.hover') -require('core.overrides.scrollbar') -require('core.overrides.toggleterm') -require('core.overrides.sfm') diff --git a/lua/core/overrides/lspkind.lua b/lua/core/overrides/lspkind.lua deleted file mode 100644 index f2f11d5..0000000 --- a/lua/core/overrides/lspkind.lua +++ /dev/null @@ -1 +0,0 @@ -require('lspkind').init() diff --git a/lua/core/overrides/lspzero.lua b/lua/core/overrides/lspzero.lua deleted file mode 100644 index 108e566..0000000 --- a/lua/core/overrides/lspzero.lua +++ /dev/null @@ -1,17 +0,0 @@ -local lsp = require('lsp-zero') -lsp.set_preferences { - suggest_lsp_servers = true, - setup_servers_on_start = true, - set_lsp_keymaps = true, - configure_diagnostics = true, - cmp_capabilities = true, - manage_nvim_cmp = false, - call_servers = 'local', - sign_icons = { - error = 'x', - warn = '!', - hint = '?', - info = 'i' - } -} -lsp.setup() diff --git a/lua/core/overrides/lualine.lua b/lua/core/overrides/lualine.lua deleted file mode 100644 index ef5bc75..0000000 --- a/lua/core/overrides/lualine.lua +++ /dev/null @@ -1,145 +0,0 @@ -local custom = require'lualine.themes.auto' - -custom.normal = { - a = { fg = colors.black, bg = colors.blue, gui = 'bold' }, - b = { fg = colors.black, bg = colors.grey, gui = 'bold' }, - c = { fg = colors.white, bg = colors.grey }, - x = {}, - y = { fg = colors.blue, bg = colors.black2 }, - z = { fg = colors.black2, bg = colors.blue, gui = 'bold' }, -} -custom.insert = { - a = { fg = colors.black, bg = colors.green, gui = 'bold' }, - b = { fg = colors.black, bg = colors.grey, gui = 'bold' }, - c = { fg = colors.white, bg = colors.grey }, - x = {}, - y = { fg = colors.green, bg = colors.black2 }, - z = { fg = colors.black2, bg = colors.green, gui = 'bold' }, -} -custom.replace = { - a = { fg = colors.black, bg = colors.orange, gui = 'bold' }, - b = { fg = colors.black, bg = colors.grey, gui = 'bold' }, - c = { fg = colors.white, bg = colors.grey }, - x = {}, - y = { fg = colors.orange, bg = colors.black2 }, - z = { fg = colors.black2, bg = colors.orange, gui = 'bold' }, -} -custom.visual = { - a = { fg = colors.black, bg = colors.purple, gui = 'bold' }, - b = { fg = colors.black, bg = colors.grey, gui = 'bold' }, - c = { fg = colors.white, bg = colors.grey }, - x = {}, - y = { fg = colors.purple, bg = colors.black2 }, - z = { fg = colors.black2, bg = colors.purple, gui = 'bold' }, -} -custom.command = { - a = { fg = colors.black, bg = colors.red, gui = 'bold' }, - b = { fg = colors.black, bg = colors.grey, gui = 'bold' }, - c = { fg = colors.white, bg = colors.grey }, - x = {}, - y = { fg = colors.red, bg = colors.black2 }, - z = { fg = colors.black2, bg = colors.red, gui = 'bold' }, -} -custom.terminal = { - a = { fg = colors.black, bg = colors.yellow, gui = 'bold' }, - b = { fg = colors.black, bg = colors.grey, gui = 'bold' }, - c = { fg = colors.white, bg = colors.grey }, - x = {}, - y = { fg = colors.yellow, bg = colors.black2 }, - z = { fg = colors.black2, bg = colors.yellow, gui = 'bold' }, -} -custom.inactive = { - a = { bg = colors.black2 }, - b = { bg = colors.black2 }, - c = { bg = colors.black2 }, - x = { bg = colors.black2 }, - y = { bg = colors.black2 }, - z = { bg = colors.black2 }, -} - -local function diff_source() - local gitsigns = vim.b.gitsigns_status_dict - if gitsigns then - return { - added = gitsigns.added, - modified = gitsigns.changed, - removed = gitsigns.removed - } - end -end - -local function maximize_status() - return require("true-zen.focus").running and '[M]' or '[]=' -end - -require('lualine').setup { - options = { - icons_enabled = false, - component_separators = { left = '', right = '' }, - section_separators = { left = '', right = '' }, - disabled_filetypes = { - statusline = { - 'no-neck-pain', - 'alpha', - 'TelescopePrompt', - }, - winbar = {}, - }, - theme = custom, - always_divide_middle = false, - globalstatus = true, - refresh = { - statusline = 500, - tabline = 1000, - winbar = 1000, - } - }, - sections = { - lualine_a = { - { 'mode' }, - { 'filetype', - color = { fg = colors.white, bg = colors.grey }, - }, - { 'filename', - filestatus = true, - path = 0, - - symbols = { - modified = '[+]', - readonly = '[=]', - unnamed = 'No Name', - newfile = '[New]', - } - } - }, - lualine_b = { - { 'diff', - source = diff_source, - }, - { 'diagnostics', - sources = {'nvim_diagnostic', 'nvim_lsp'}, - sections = {'error', 'warn', 'info', 'hint'}, - diagnostics_color = { - error = 'DiagnosticError', - warn = 'DiagnosticWarn', - info = 'DiagnosticInfo', - hint = 'DiagnosticHint', - }, - symbols = {error = '[x]', warn = '[!]', info = '[i]', hint = '[?]'}, - } - }, - lualine_c = {}, - lualine_x = { - { 'fileformat', - color = { gui = 'bold' } - } - }, - lualine_y = { - { maximize_status }, - }, - lualine_z = { 'progress' } - }, - inactive_sections = { - lualine_x = {'location'}, - }, -} diff --git a/lua/core/overrides/modicator.lua b/lua/core/overrides/modicator.lua deleted file mode 100644 index dc978de..0000000 --- a/lua/core/overrides/modicator.lua +++ /dev/null @@ -1,18 +0,0 @@ -require('modicator').setup({ - show_warnings = true, - highlights = { - defaults = { - bold = true, - }, - modes = { - ['i'] = { foreground = colors.green, }, - ['v'] = { foreground = colors.purple, }, - ['V'] = { foreground = colors.purple, }, - [''] = { foreground = colors.purple, }, - ['s'] = { foreground = colors.purple, }, - ['S'] = { foreground = colors.yellow, }, - ['R'] = { foreground = colors.orange, }, - ['c'] = { foreground = colors.red, }, - }, - }, -}) diff --git a/lua/core/overrides/neoclip.lua b/lua/core/overrides/neoclip.lua deleted file mode 100644 index a41877d..0000000 --- a/lua/core/overrides/neoclip.lua +++ /dev/null @@ -1,9 +0,0 @@ -require('neoclip').setup { - keys = { - telescope = { - i = { - paste_behind = ' ' - }, - }, - }, -} diff --git a/lua/core/overrides/neorg.lua b/lua/core/overrides/neorg.lua deleted file mode 100644 index dc6df57..0000000 --- a/lua/core/overrides/neorg.lua +++ /dev/null @@ -1,18 +0,0 @@ -require('neorg').setup { - load = { - ['core.defaults'] = {}, - ['core.norg.concealer'] = { - config = { - dim_code_blocks = { - width = 'content', - padding = { right = 2, }, - }, - folds = false, - } - }, - ['core.norg.completion'] = { - config = { engine = 'nvim-cmp', } - }, - ['core.integrations.nvim-cmp'] = {}, - } -} diff --git a/lua/core/overrides/notify.lua b/lua/core/overrides/notify.lua deleted file mode 100644 index f816d86..0000000 --- a/lua/core/overrides/notify.lua +++ /dev/null @@ -1,14 +0,0 @@ -require('notify').setup( - { - icons = { - DEBUG = "B", - ERROR = "x", - INFO = "i", - TRACE = "t", - WARN = "!" - }, - minimum_width = 35, - max_width = 80, - render = "compact", - } -) diff --git a/lua/core/overrides/scrollbar.lua b/lua/core/overrides/scrollbar.lua deleted file mode 100644 index dbce04f..0000000 --- a/lua/core/overrides/scrollbar.lua +++ /dev/null @@ -1,29 +0,0 @@ -require("scrollbar").setup({ - show = true, - show_in_active_only = true, - handle = { - color = colors.bg_highlight, - }, - marks = { - Search = { color = colors.pink }, - Error = { color = colors.red }, - Warn = { color = colors.orange }, - Info = { color = colors.blue }, - Hint = { color = colors.grey2 }, - Misc = { color = colors.purple }, - }, - excluded_buftypes = { - "terminal", - }, - excluded_filetypes = { - "prompt", - "TelescopePrompt", - "noice", - "alpha", - "sfm", - }, - handlers = { - diagnostic = true, - gitsigns = true, - } -}) diff --git a/lua/core/overrides/smartsplits.lua b/lua/core/overrides/smartsplits.lua deleted file mode 100644 index 5e677ab..0000000 --- a/lua/core/overrides/smartsplits.lua +++ /dev/null @@ -1,7 +0,0 @@ -require('smart-splits').setup { - resize_mode = { - hooks = { - on_leave = require('bufresize').register - }, - }, -} diff --git a/lua/core/overrides/toggleterm.lua b/lua/core/overrides/toggleterm.lua deleted file mode 100644 index 4f5f598..0000000 --- a/lua/core/overrides/toggleterm.lua +++ /dev/null @@ -1,19 +0,0 @@ -require('toggleterm').setup { - shade_terminals = true, -} - -local Terminal = require('toggleterm.terminal').Terminal -local glow = Terminal:new({ - cmd = "glow", - hidden = true, - direction = "float", - float_opts = { - border = "shadow", - width = 120, - height = 50, - } -}) - -function _glow() - glow:toggle() -end diff --git a/lua/core/overrides/treesitter.lua b/lua/core/overrides/treesitter.lua deleted file mode 100644 index e74af0d..0000000 --- a/lua/core/overrides/treesitter.lua +++ /dev/null @@ -1,15 +0,0 @@ -require('nvim-treesitter.configs').setup { - ensure_installed = { - 'help', - 'c', - 'lua', - 'norg', - 'bash', - 'html', - 'make', - }, - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - }, -} diff --git a/lua/core/overrides/treesj.lua b/lua/core/overrides/treesj.lua deleted file mode 100644 index dc618de..0000000 --- a/lua/core/overrides/treesj.lua +++ /dev/null @@ -1,3 +0,0 @@ -require('treesj').setup({ - use_default_keymaps = false, -}) diff --git a/lua/core/overrides/truezen.lua b/lua/core/overrides/truezen.lua deleted file mode 100644 index 4132a6a..0000000 --- a/lua/core/overrides/truezen.lua +++ /dev/null @@ -1,13 +0,0 @@ -require('true-zen').setup { - modes = { - ataraxis = { -- normal zen - minimum_writing_area = { -- minimum size of main window - width = 120, - height = 44, - }, - }, - narrow = { - folds_style = "invisible", - }, - }, -} diff --git a/lua/core/overrides/whichkey.lua b/lua/core/overrides/whichkey.lua deleted file mode 100644 index 65b6ca4..0000000 --- a/lua/core/overrides/whichkey.lua +++ /dev/null @@ -1,8 +0,0 @@ -require("which-key").setup { - icons = { - breadcrumb = '>>', - separator = '->', - }, - window = { winblend = 3, }, - layout = { align = 'center', }, -} |