diff options
author | Squibid <me@zacharyscheiman.com> | 2022-12-30 12:44:28 -0500 |
---|---|---|
committer | Squibid <me@zacharyscheiman.com> | 2022-12-30 12:44:28 -0500 |
commit | 4ec198e9de4c29378a9307f739770e71282d5d45 (patch) | |
tree | 332bed8d9fa2c91e8469faf74ac50ccfaa631c4b /lua/core/overrides | |
parent | eaa58ff6184e6b0bb3abf03d2314864795a13fbd (diff) | |
download | nvim-4ec198e9de4c29378a9307f739770e71282d5d45.tar.gz nvim-4ec198e9de4c29378a9307f739770e71282d5d45.tar.bz2 nvim-4ec198e9de4c29378a9307f739770e71282d5d45.zip |
fix config not working in other dirs. whoops
Diffstat (limited to 'lua/core/overrides')
-rw-r--r-- | lua/core/overrides/cmp.lua | 122 | ||||
-rw-r--r-- | lua/core/overrides/cmpluasnipchoice.lua | 3 | ||||
-rw-r--r-- | lua/core/overrides/codewindow.lua | 16 | ||||
-rw-r--r-- | lua/core/overrides/colorizer.lua | 8 | ||||
-rw-r--r-- | lua/core/overrides/indentblankline.lua | 22 | ||||
-rw-r--r-- | lua/core/overrides/init.lua | 17 | ||||
-rw-r--r-- | lua/core/overrides/lspkind.lua | 1 | ||||
-rw-r--r-- | lua/core/overrides/lspzero.lua | 17 | ||||
-rw-r--r-- | lua/core/overrides/lualine.lua | 119 | ||||
-rw-r--r-- | lua/core/overrides/modicator.lua | 15 | ||||
-rw-r--r-- | lua/core/overrides/neoclip.lua | 9 | ||||
-rw-r--r-- | lua/core/overrides/neorg.lua | 17 | ||||
-rw-r--r-- | lua/core/overrides/smartsplits.lua | 7 | ||||
-rw-r--r-- | lua/core/overrides/telescope.lua | 33 | ||||
-rw-r--r-- | lua/core/overrides/treesitter.lua | 14 | ||||
-rw-r--r-- | lua/core/overrides/treesittercontext.lua | 9 | ||||
-rw-r--r-- | lua/core/overrides/trouble.lua | 11 | ||||
-rw-r--r-- | lua/core/overrides/whichkey.lua | 8 |
18 files changed, 448 insertions, 0 deletions
diff --git a/lua/core/overrides/cmp.lua b/lua/core/overrides/cmp.lua new file mode 100644 index 0000000..2b6a9cd --- /dev/null +++ b/lua/core/overrides/cmp.lua @@ -0,0 +1,122 @@ +local has_words_before = function() + unpack = unpack or table.unpack + local line, col = unpack(a.nvim_win_get_cursor(0)) + return col ~= 0 and a.nvim_buf_get_lines(0, line - 1, line, true) + [1]:sub(col, col):match("%s") == nil +end + +local cmp = require('cmp') +local luasnip = require('luasnip') +require("luasnip.loaders.from_vscode").lazy_load() + +cmp.setup { + completion = { autocomplete = false, }, + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + sources = cmp.config.sources({ + { name = 'nvim_lsp', keyword_length = 3 }, + { name = 'luasnip', keyword_length = 3 }, + { name = 'path' }, + { name = 'buffer', keyword_length = 3, max_item_count = 7 }, + { name = 'calc' }, + }), + window = { + completion = { + winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None", + col_offset = -3, + side_padding = 0, + } + }, + formatting = { + fields = { "kind", "abbr", "menu" }, + format = function(entry, vim_item) + local kind_icons = { + 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 = ' ', + Struct = ' ', + Event = ' ', + Operator = ' ', + TypeParameter = ' ', + } + local menu_items = { + buffer = "buffer", + nvim_lsp = "LSP", + luasnip = "luasnip", + nvim_lua = "lua", + calc = "calc", + } + + vim_item.kind = string.format(' %s ', kind_icons[vim_item.kind]) + vim_item.menu = string.format(' (%s)', menu_items[entry.source.name]) + + return vim_item + end + }, + mapping = cmp.mapping.preset.insert({ + ["<Tab>"] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), + ["<S-Tab>"] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + ['<CR>'] = cmp.mapping.confirm({ select = true }), + ['<ESC>'] = cmp.mapping.close(), + }), + sorting = { + comparators = { + cmp.config.compare.offset, + cmp.config.compare.exact, + cmp.config.compare.score, + require "cmp-under-comparator".under, + cmp.config.compare.kind, + cmp.config.compare.sort_text, + cmp.config.compare.length, + cmp.config.compare.order, + }, + }, + enabled = function() + local context = require 'cmp.config.context' + if a.nvim_get_mode().mode == 'c' then + return true + else + return not context.in_treesitter_capture("comment") + and not context.in_syntax_group("Comment") + end + end +} diff --git a/lua/core/overrides/cmpluasnipchoice.lua b/lua/core/overrides/cmpluasnipchoice.lua new file mode 100644 index 0000000..52aa759 --- /dev/null +++ b/lua/core/overrides/cmpluasnipchoice.lua @@ -0,0 +1,3 @@ +require('cmp_luasnip_choice').setup { + auto_open = true, +} diff --git a/lua/core/overrides/codewindow.lua b/lua/core/overrides/codewindow.lua new file mode 100644 index 0000000..cfc4dad --- /dev/null +++ b/lua/core/overrides/codewindow.lua @@ -0,0 +1,16 @@ +local codewindow = require('codewindow') +codewindow.setup({ + show_cursor = false, + minimap_width = 15, + window_border = 'single', + exclude_filetypes = { + "netrw", + "help", + "term", + "gitcommit", + "packer", + "vim", + "Trouble", + }, +}) +codewindow.apply_default_keybinds() diff --git a/lua/core/overrides/colorizer.lua b/lua/core/overrides/colorizer.lua new file mode 100644 index 0000000..a18101e --- /dev/null +++ b/lua/core/overrides/colorizer.lua @@ -0,0 +1,8 @@ +require('colorizer').setup { + filetypes = { '*' }, + user_default_options = { + names = false, + RRGGBBAA = true, + AARRGGBB = true, + }, +} diff --git a/lua/core/overrides/indentblankline.lua b/lua/core/overrides/indentblankline.lua new file mode 100644 index 0000000..0e43c22 --- /dev/null +++ b/lua/core/overrides/indentblankline.lua @@ -0,0 +1,22 @@ +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 new file mode 100644 index 0000000..a8d5d89 --- /dev/null +++ b/lua/core/overrides/init.lua @@ -0,0 +1,17 @@ +require('core.overrides.indentblankline') +require('core.overrides.lualine') +require('core.overrides.telescope') +require('core.overrides.codewindow') +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.treesittercontext') +require('core.overrides.colorizer') +require('core.overrides.trouble') +require('core.overrides.lspzero') +require('core.overrides.cmp') +require('core.overrides.lspkind') +require('core.overrides.cmpluasnipchoice') diff --git a/lua/core/overrides/lspkind.lua b/lua/core/overrides/lspkind.lua new file mode 100644 index 0000000..f2f11d5 --- /dev/null +++ b/lua/core/overrides/lspkind.lua @@ -0,0 +1 @@ +require('lspkind').init() diff --git a/lua/core/overrides/lspzero.lua b/lua/core/overrides/lspzero.lua new file mode 100644 index 0000000..108e566 --- /dev/null +++ b/lua/core/overrides/lspzero.lua @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..21473f9 --- /dev/null +++ b/lua/core/overrides/lualine.lua @@ -0,0 +1,119 @@ +local custom = require'lualine.themes.auto' + +custom.normal = { + a = { fg = colors.black, bg = colors.blue, gui = 'bold' }, + b = { fg = colors.black, bg = colors.blue, 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.green, 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.orange, 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.purple, 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.red, 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.yellow, 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.grey }, + b = { bg = colors.grey }, + c = { bg = colors.grey }, + x = { bg = colors.grey }, + y = { bg = colors.grey }, + z = { bg = colors.grey }, +} + +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 + +require('lualine').setup { + options = { + icons_enabled = false, + component_separators = { left = '', right = '' }, + section_separators = { left = '', right = '' }, + theme = custom, + always_divide_middle = false, + globalstatus = false, + refresh = { + statusline = 100, + tabline = 1000, + winbar = 1000, + } + }, + sections = { + lualine_a = {'mode'}, + lualine_b = { + { 'filetype', + color = { fg = colors.white, bg = colors.grey }, + }, + { 'filename', + filestatus = true, + path = 1, + + symbols = { + modified = '[+]', + readonly = '[=]', + unnamed = 'No Name', + newfile = '[New]', + } + } + }, + lualine_c = { { 'diff', source = diff_source } }, + lualine_x = { + { 'fileformat', + color = { gui = 'bold' } + } + }, + lualine_y = {'progress'}, + lualine_z = { + { 'location', + padding = 1, + } + } + }, + inactive_sections = { + lualine_x = {'location'}, + }, +} diff --git a/lua/core/overrides/modicator.lua b/lua/core/overrides/modicator.lua new file mode 100644 index 0000000..5cc6925 --- /dev/null +++ b/lua/core/overrides/modicator.lua @@ -0,0 +1,15 @@ +require('modicator').setup { + show_warnings = true, + highlights = { + modes = { + ['i'] = colors.green, + ['v'] = colors.purple, + ['V'] = colors.purple, + ['�'] = colors.purple, + ['s'] = colors.yellow, + ['S'] = colors.yellow, + ['R'] = colors.orange, + ['c'] = colors.red, + } + } +} diff --git a/lua/core/overrides/neoclip.lua b/lua/core/overrides/neoclip.lua new file mode 100644 index 0000000..a41877d --- /dev/null +++ b/lua/core/overrides/neoclip.lua @@ -0,0 +1,9 @@ +require('neoclip').setup { + keys = { + telescope = { + i = { + paste_behind = ' ' + }, + }, + }, +} diff --git a/lua/core/overrides/neorg.lua b/lua/core/overrides/neorg.lua new file mode 100644 index 0000000..8412901 --- /dev/null +++ b/lua/core/overrides/neorg.lua @@ -0,0 +1,17 @@ +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', } + }, + } +} diff --git a/lua/core/overrides/smartsplits.lua b/lua/core/overrides/smartsplits.lua new file mode 100644 index 0000000..5e677ab --- /dev/null +++ b/lua/core/overrides/smartsplits.lua @@ -0,0 +1,7 @@ +require('smart-splits').setup { + resize_mode = { + hooks = { + on_leave = require('bufresize').register + }, + }, +} diff --git a/lua/core/overrides/telescope.lua b/lua/core/overrides/telescope.lua new file mode 100644 index 0000000..546a33c --- /dev/null +++ b/lua/core/overrides/telescope.lua @@ -0,0 +1,33 @@ +local telescope = require('telescope') +local actions = require('telescope.actions') + +telescope.load_extension('undo') +telescope.setup { + defaults = { + borderchars = { " ", " ", " ", " ", " ", " ", " ", " " }, + sorting_strategy = 'ascending', + layout_config = { + height = 0.9, + prompt_position = 'top', + }, + mappings = { + i = { + ['<C-h>'] = 'which_key', + ['<C-j>'] = actions.move_selection_next, + ['<C-k>'] = actions.move_selection_previous, + ['<C-l>'] = actions.select_default, + ['<C-u>'] = actions.preview_scrolling_up, + ['<C-d>'] = actions.preview_scrolling_down, + }, + n = { + ["gg"] = actions.move_to_top, + ["G"] = actions.move_to_bottom, + }, + }, + } +} + +a.nvim_create_autocmd('User', { + pattern = 'TelescopePreviewerLoaded', + command = 'setlocal number', +}) diff --git a/lua/core/overrides/treesitter.lua b/lua/core/overrides/treesitter.lua new file mode 100644 index 0000000..a4d2dfe --- /dev/null +++ b/lua/core/overrides/treesitter.lua @@ -0,0 +1,14 @@ +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/treesittercontext.lua b/lua/core/overrides/treesittercontext.lua new file mode 100644 index 0000000..8a60704 --- /dev/null +++ b/lua/core/overrides/treesittercontext.lua @@ -0,0 +1,9 @@ +require('treesitter-context').setup { + enable = true, + max_lines = 1, + patterns = { + default = { + 'function', + }, + }, +} diff --git a/lua/core/overrides/trouble.lua b/lua/core/overrides/trouble.lua new file mode 100644 index 0000000..eabbd7e --- /dev/null +++ b/lua/core/overrides/trouble.lua @@ -0,0 +1,11 @@ +require("trouble").setup { + icons = false, + fold_open = "v", + fold_closed = ">", + signs = { + error = "[x]", + warning = "[!]", + hint = "[?]", + information = "[i]" + }, +} diff --git a/lua/core/overrides/whichkey.lua b/lua/core/overrides/whichkey.lua new file mode 100644 index 0000000..65b6ca4 --- /dev/null +++ b/lua/core/overrides/whichkey.lua @@ -0,0 +1,8 @@ +require("which-key").setup { + icons = { + breadcrumb = '>>', + separator = '->', + }, + window = { winblend = 3, }, + layout = { align = 'center', }, +} |