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 /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 'core/overrides')
-rw-r--r-- | core/overrides/cmp.lua | 122 | ||||
-rw-r--r-- | core/overrides/cmpluasnipchoice.lua | 3 | ||||
-rw-r--r-- | core/overrides/codewindow.lua | 16 | ||||
-rw-r--r-- | core/overrides/colorizer.lua | 8 | ||||
-rw-r--r-- | core/overrides/indentblankline.lua | 22 | ||||
-rw-r--r-- | core/overrides/init.lua | 17 | ||||
-rw-r--r-- | core/overrides/lspkind.lua | 1 | ||||
-rw-r--r-- | core/overrides/lspzero.lua | 17 | ||||
-rw-r--r-- | core/overrides/lualine.lua | 119 | ||||
-rw-r--r-- | core/overrides/modicator.lua | 15 | ||||
-rw-r--r-- | core/overrides/neoclip.lua | 9 | ||||
-rw-r--r-- | core/overrides/neorg.lua | 17 | ||||
-rw-r--r-- | core/overrides/smartsplits.lua | 7 | ||||
-rw-r--r-- | core/overrides/telescope.lua | 33 | ||||
-rw-r--r-- | core/overrides/treesitter.lua | 14 | ||||
-rw-r--r-- | core/overrides/treesittercontext.lua | 9 | ||||
-rw-r--r-- | core/overrides/trouble.lua | 11 | ||||
-rw-r--r-- | core/overrides/whichkey.lua | 8 |
18 files changed, 0 insertions, 448 deletions
diff --git a/core/overrides/cmp.lua b/core/overrides/cmp.lua deleted file mode 100644 index 2b6a9cd..0000000 --- a/core/overrides/cmp.lua +++ /dev/null @@ -1,122 +0,0 @@ -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/core/overrides/cmpluasnipchoice.lua b/core/overrides/cmpluasnipchoice.lua deleted file mode 100644 index 52aa759..0000000 --- a/core/overrides/cmpluasnipchoice.lua +++ /dev/null @@ -1,3 +0,0 @@ -require('cmp_luasnip_choice').setup { - auto_open = true, -} diff --git a/core/overrides/codewindow.lua b/core/overrides/codewindow.lua deleted file mode 100644 index cfc4dad..0000000 --- a/core/overrides/codewindow.lua +++ /dev/null @@ -1,16 +0,0 @@ -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/core/overrides/colorizer.lua b/core/overrides/colorizer.lua deleted file mode 100644 index a18101e..0000000 --- a/core/overrides/colorizer.lua +++ /dev/null @@ -1,8 +0,0 @@ -require('colorizer').setup { - filetypes = { '*' }, - user_default_options = { - names = false, - RRGGBBAA = true, - AARRGGBB = true, - }, -} diff --git a/core/overrides/indentblankline.lua b/core/overrides/indentblankline.lua deleted file mode 100644 index 0e43c22..0000000 --- a/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/core/overrides/init.lua b/core/overrides/init.lua deleted file mode 100644 index a8d5d89..0000000 --- a/core/overrides/init.lua +++ /dev/null @@ -1,17 +0,0 @@ -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/core/overrides/lspkind.lua b/core/overrides/lspkind.lua deleted file mode 100644 index f2f11d5..0000000 --- a/core/overrides/lspkind.lua +++ /dev/null @@ -1 +0,0 @@ -require('lspkind').init() diff --git a/core/overrides/lspzero.lua b/core/overrides/lspzero.lua deleted file mode 100644 index 108e566..0000000 --- a/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/core/overrides/lualine.lua b/core/overrides/lualine.lua deleted file mode 100644 index 21473f9..0000000 --- a/core/overrides/lualine.lua +++ /dev/null @@ -1,119 +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.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/core/overrides/modicator.lua b/core/overrides/modicator.lua deleted file mode 100644 index 5cc6925..0000000 --- a/core/overrides/modicator.lua +++ /dev/null @@ -1,15 +0,0 @@ -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/core/overrides/neoclip.lua b/core/overrides/neoclip.lua deleted file mode 100644 index a41877d..0000000 --- a/core/overrides/neoclip.lua +++ /dev/null @@ -1,9 +0,0 @@ -require('neoclip').setup { - keys = { - telescope = { - i = { - paste_behind = ' ' - }, - }, - }, -} diff --git a/core/overrides/neorg.lua b/core/overrides/neorg.lua deleted file mode 100644 index 8412901..0000000 --- a/core/overrides/neorg.lua +++ /dev/null @@ -1,17 +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', } - }, - } -} diff --git a/core/overrides/smartsplits.lua b/core/overrides/smartsplits.lua deleted file mode 100644 index 5e677ab..0000000 --- a/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/core/overrides/telescope.lua b/core/overrides/telescope.lua deleted file mode 100644 index 546a33c..0000000 --- a/core/overrides/telescope.lua +++ /dev/null @@ -1,33 +0,0 @@ -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/core/overrides/treesitter.lua b/core/overrides/treesitter.lua deleted file mode 100644 index a4d2dfe..0000000 --- a/core/overrides/treesitter.lua +++ /dev/null @@ -1,14 +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/core/overrides/treesittercontext.lua b/core/overrides/treesittercontext.lua deleted file mode 100644 index 8a60704..0000000 --- a/core/overrides/treesittercontext.lua +++ /dev/null @@ -1,9 +0,0 @@ -require('treesitter-context').setup { - enable = true, - max_lines = 1, - patterns = { - default = { - 'function', - }, - }, -} diff --git a/core/overrides/trouble.lua b/core/overrides/trouble.lua deleted file mode 100644 index eabbd7e..0000000 --- a/core/overrides/trouble.lua +++ /dev/null @@ -1,11 +0,0 @@ -require("trouble").setup { - icons = false, - fold_open = "v", - fold_closed = ">", - signs = { - error = "[x]", - warning = "[!]", - hint = "[?]", - information = "[i]" - }, -} diff --git a/core/overrides/whichkey.lua b/core/overrides/whichkey.lua deleted file mode 100644 index 65b6ca4..0000000 --- a/core/overrides/whichkey.lua +++ /dev/null @@ -1,8 +0,0 @@ -require("which-key").setup { - icons = { - breadcrumb = '>>', - separator = '->', - }, - window = { winblend = 3, }, - layout = { align = 'center', }, -} |