diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore deleted file mode 100644 index e033bc6..0000000 --- a/.config/nvim/.gitignore +++ /dev/null @@ -1 +0,0 @@ -lazy-lock.json diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua deleted file mode 100644 index 6bb4b10..0000000 --- a/.config/nvim/init.lua +++ /dev/null @@ -1,43 +0,0 @@ -require('config.common') -require('config.keymap') - -if vim.g.neovide then - require('config.neovide') -end - ---------------------------------- ---- Fix: auto detect filetype --- ---------------------------------- -vim.api.nvim_create_autocmd({ 'BufWinEnter', 'BufReadPost' }, { - pattern = '*', - callback = function () - if vim.bo.filetype == '' then - vim.cmd('filetype detect') - end - end, -}) - ------------------ ---- lazy.nvim --- ------------------ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end -end -vim.opt.rtp:prepend(lazypath) - -require('lazy').setup({ - spec = { - { import = "plugins" }, - }, -}) diff --git a/.config/nvim/lua/config/common.lua b/.config/nvim/lua/config/common.lua deleted file mode 100644 index aa429bb..0000000 --- a/.config/nvim/lua/config/common.lua +++ /dev/null @@ -1,36 +0,0 @@ -local opt = vim.opt - -opt.number = true -opt.relativenumber = true -opt.ruler = true ---opt.colorcolumn = "80" - -opt.expandtab = true -opt.tabstop = 4 -opt.softtabstop = 4 -opt.shiftwidth = 4 - -opt.autoindent = true - -opt.hlsearch = true -opt.incsearch = true -opt.ignorecase = true -opt.smartcase = true - -opt.swapfile = false -opt.backup = false -opt.writebackup = false - -opt.showmatch = true - -opt.wrap = false - -opt.compatible = false - -opt.clipboard:append("unnamedplus") - -opt.termguicolors = true -opt.signcolumn = "yes" - -opt.list = true -opt.listchars = { trail = 'ยท', extends = '>'} diff --git a/.config/nvim/lua/config/keymap.lua b/.config/nvim/lua/config/keymap.lua deleted file mode 100644 index 4560396..0000000 --- a/.config/nvim/lua/config/keymap.lua +++ /dev/null @@ -1,45 +0,0 @@ -local kms = vim.keymap.set -vim.g.mapleader = ';' - --- window - -- switch -kms('', 'h', 'h') -kms('', 'j', 'j') -kms('', 'k', 'k') -kms('', 'l', 'l') -kms('', 'w', 'w') -kms('', 'H', 'H') -kms('', 'J', 'J') -kms('', 'K', 'K') -kms('', 'L', 'L') -kms('i', '', 'h') -kms('i', '', 'j') -kms('i', '', 'k') -kms('i', '', 'l') - -- close -kms('n', 'h', 'h:q') -kms('n', 'j', 'j:q') -kms('n', 'k', 'k:q') -kms('n', 'l', 'l:q') --- cancle something -kms('n', '/', ':noh') - --- buffer -kms('n', '', ':bprev') -kms('n', '', ':bnext') - --- editing -kms('i', 'w', ':wa') -kms('i', 'c', 'cc') -kms('i', 'a', 'A') -kms('i', ';', 'A;') -kms('i', ',', 'A,') -kms('i', 'j', 'o') -kms('i', 'k', 'O') - --- Move multi lines -kms('v', 'J', ':m \'>+1gv=gv') -kms('v', 'K', ':m \'<-2gv=gv') - --- terminal --- kms('t', '', '') diff --git a/.config/nvim/lua/config/neovide.lua b/.config/nvim/lua/config/neovide.lua deleted file mode 100644 index 3b1ab34..0000000 --- a/.config/nvim/lua/config/neovide.lua +++ /dev/null @@ -1,40 +0,0 @@ -vim.opt.guifont = { "FiraCode Nerd Font" } - -vim.g.neovide_opacity = 0.3 -vim.g.neovide_normal_opacity = 0.6 -vim.g.neovide_window_blurred = true - -vim.g.neovide_hide_mouse_when_typing = true -vim.g.neovide_fullscreen = false -vim.g.neovide_remember_window_size = true - -vim.g.neovide_refresh_rate = 60 -vim.g.neovide_refresh_rate_idle = 5 -vim.g.neovide_no_idle = false ---vim.g.neovide_profiler = true - -vim.g.neovide_cursor_smooth_blink = true -vim.g.neovide_cursor_vfx_mode = "torpedo" -vim.g.neovide_cursor_vfx_particle_lifetime = 3.0 -vim.g.neovide_cursor_vfx_particle_density = 4.5 - -vim.g.neovide_floating_shadow = true - -local function set_ime(args) - if args.event:match("Enter$") then - vim.g.neovide_input_ime = true - else - vim.g.neovide_input_ime = false - end -end -local ime_input = vim.api.nvim_create_augroup("ime_input", { clear = true }) -vim.api.nvim_create_autocmd({"InsertEnter", "InsertLeave"}, { - group = ime_input, - pattern = "*", - callback = set_ime, -}) -vim.api.nvim_create_autocmd({"CmdlineEnter", "CmdlineLeave"}, { - group = ime_input, - pattern = "[/\\?]", - callback = set_ime, -}) diff --git a/.config/nvim/lua/plugins/conf/cmp.lua b/.config/nvim/lua/plugins/conf/cmp.lua deleted file mode 100644 index dccd1e9..0000000 --- a/.config/nvim/lua/plugins/conf/cmp.lua +++ /dev/null @@ -1,60 +0,0 @@ --- local cmp_autopairs = require('nvim-autopairs.completion.cmp') - -return { - opts = { - cmdline = { enabled = false }, - snippets = { preset = 'default' }, - completion = { - keyword = { range = 'full' }, --'prefix', 'full' - accept = { - auto_brackets = { enabled = false }, - }, - list = { - selection = { - preselect = false, - auto_insert = true, - }, - }, - menu = { - auto_show = true, - }, - documentation = { - auto_show = true, - auto_show_delay_ms = 500, - }, - ghost_text = { enabled = true }, - }, - sources = { - default = { 'lsp', 'path', 'snippets', 'buffer' }, - }, - keymap = { - preset = 'none', - - -- [''] = { 'show', 'show_documentation', 'hide_documentation' }, - [''] = { 'hide', 'fallback' }, - [''] = { 'accept', 'fallback' }, - --[''] = { 'select_and_accept', 'fallback' }, - [''] = { 'accept', 'fallback' }, - -- [''] = { function(cmp) - -- return cmp.accept({ callback = cmp_autopairs.on_confirm_done }) - -- end }, - -- [''] = { function(cmp) - -- return cmp.select_and_accept({ callback = cmp_autopairs.on_confirm_done }) - -- end }, - - [''] = { 'select_prev', 'fallback' }, - [''] = { 'select_next', 'fallback' }, - [''] = { 'select_prev', 'fallback_to_mappings' }, - [''] = { 'select_next', 'fallback_to_mappings' }, - - [''] = { 'scroll_documentation_up', 'fallback' }, - [''] = { 'scroll_documentation_down', 'fallback' }, - - [''] = { 'snippet_forward', 'fallback' }, - [''] = { 'snippet_backward', 'fallback' }, - - [''] = { 'show_signature', 'hide_signature', 'fallback' }, - }, - signature = { enabled = true }, - } -} diff --git a/.config/nvim/lua/plugins/conf/cmp.lua.nvim-cmp b/.config/nvim/lua/plugins/conf/cmp.lua.nvim-cmp deleted file mode 100644 index 05995ea..0000000 --- a/.config/nvim/lua/plugins/conf/cmp.lua.nvim-cmp +++ /dev/null @@ -1,64 +0,0 @@ -local cmp = require('cmp') -cmp.setup({ - snippet = { - expand = function(args) - vim.snippet.expand(args.body) - end - }, - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), - }, - mapping = cmp.mapping.preset.insert({ - --[''] = cmp.mapping.scroll_docs(-4), - --[''] = cmp.mapping.scroll_docs(4), - --[''] = cmp.mapping.complete(), - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }), - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - --elseif luasnip.expand_or_jumpable() then - -- luasnip.expand_or_jump() - else - fallback() - end - end, { 'i', 's' }), - [''] = 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' }), - }), - sources = { - { name = 'nvim_lsp' }, - { name = 'buffer' }, - { name = 'path' }, - { name = 'cmdline' }, - }, - 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, - }, - }, -}) - -local cmp_autopairs = require('nvim-autopairs.completion.cmp') -cmp.event:on( - 'confirm_done', - cmp_autopairs.on_confirm_done() -) diff --git a/.config/nvim/lua/plugins/conf/lsp.lua b/.config/nvim/lua/plugins/conf/lsp.lua deleted file mode 100644 index b46bebe..0000000 --- a/.config/nvim/lua/plugins/conf/lsp.lua +++ /dev/null @@ -1,118 +0,0 @@ -local M = {} - -M.config = function() - -- Mapping - local opts = { noremap = true, silent = true } - local kms = vim.keymap.set - kms('n', 'e', vim.diagnostic.open_float, opts) - kms('n', '[d', function() vim.diagnostic.jump({ count = 1, float = true }) end, opts) - kms('n', ']d', function() vim.diagnostic.jump({ count = -1, float = true }) end, opts) - kms('n', 'q', vim.diagnostic.setloclist, opts) - - vim.lsp.config('*', { - capabilities = require('blink.cmp').get_lsp_capabilities(), - on_attach = function(_, bufnr) - -- Enable completion triggered by - vim.api.nvim_set_option_value('omnifunc', 'v:lua.vim.lsp.omnifunc', { buf = bufnr }) - - -- Mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local bufopts = { noremap = true, silent = true, buffer = bufnr } - local kms = vim.keymap.set - -- goto * - kms('n', 'gD', vim.lsp.buf.declaration, bufopts) - kms('n', 'gd', vim.lsp.buf.definition, bufopts) - kms('n', 'gr', vim.lsp.buf.references, bufopts) - kms('n', 'gi', vim.lsp.buf.implementation, bufopts) - --kms('n', 'D', vim.lsp.buf.type_definition, bufopts) - -- show info - kms('n', 'K', vim.lsp.buf.hover, bufopts) - kms('n', '', vim.lsp.buf.signature_help, bufopts) - -- Workspace - kms('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) - kms('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) - kms('n', 'wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts) - -- operation - kms('n', 'rn', vim.lsp.buf.rename, bufopts) - kms('n', 'ca', vim.lsp.buf.code_action, bufopts) - kms('n', 'f', function() vim.lsp.buf.format { async = true } end, bufopts) - end, - }) - - vim.lsp.config('lua_ls', { - --cmd = { 'lua-language-server.cmd' }, - on_init = function(client) - if client.workspace_folders then - local path = client.workspace_folders[1].name - if - path ~= vim.fn.stdpath('config') - and (vim.uv.fs_stat(path .. '/.luarc.json') or vim.uv.fs_stat(path .. '/.luarc.jsonc')) - then - return - end - end - - client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, { - runtime = { - -- Tell the language server which version of Lua you're using (most - -- likely LuaJIT in the case of Neovim) - version = 'Lua 5.5', - -- Tell the language server how to find Lua modules same way as Neovim - -- (see `:h lua-module-load`) - path = { - 'lua/?.lua', - 'lua/?/init.lua', - '/usr/share/lua/5.5/?.lua', - '/usr/share/lua/5.5/?/init.lua', - }, - }, - workspace = { - checkThirdParty = false, - library = { - -- Make the server aware of Neovim runtime files - vim.env.VIMRUNTIME, - vim.api.nvim_get_runtime_file('lua/lspconfig', false)[1], - '/usr/share/hypr/stubs', - '/usr/share/lua/5.5', - }, - -- Or pull in all of 'runtimepath'. - -- NOTE: this is a lot slower and will cause issues when working on - -- your own configuration. - -- See https://github.com/neovim/nvim-lspconfig/issues/3189 - -- library = vim.api.nvim_get_runtime_file('', true), - }, - }) - end, - }) - vim.lsp.enable('lua_ls') - - vim.lsp.enable('rust_analyzer') - - vim.lsp.config('powershell_es', { - bundle_path = 'D:/DevKits/SDKs/LSP/MasonManaged/packages/powershell-editor-services', - shell = 'powershell.exe', - }) - vim.lsp.enable('powershell_es') - - vim.lsp.enable('csharp_ls') - - vim.lsp.config('jsonls', { - capabilities = setmetatable({ - textDocument = { completion = { completionItem = { snippetSupport = true } } } - }, { - __index = require('blink.cmp').get_lsp_capabilities() - }), - cmd = { 'node.exe', 'D:/DevKits/SDKs/LSP/MasonManaged/packages/json-lsp/node_modules/vscode-langservers-extracted/bin/vscode-json-language-server', '--stdio' }, - }) - vim.lsp.enable('jsonls') - - vim.lsp.config('qmlls', { cmd = { 'qmlls6' } }) - vim.lsp.enable('qmlls') - - vim.lsp.config('gdscript', {}) - vim.lsp.enable('gdscript') -end - -return M diff --git a/.config/nvim/lua/plugins/conf/lsp.lua.nvim-cmp b/.config/nvim/lua/plugins/conf/lsp.lua.nvim-cmp deleted file mode 100644 index b042b9f..0000000 --- a/.config/nvim/lua/plugins/conf/lsp.lua.nvim-cmp +++ /dev/null @@ -1,107 +0,0 @@ -local M = {} - -M.config = function() - -- Mapping - local opts = { noremap = true, silent = true } - local kms = vim.keymap.set - kms('n', 'e', vim.diagnostic.open_float, opts) - kms('n', '[d', function() vim.diagnostic.jump({ count = 1, float = true }) end, opts) - kms('n', ']d', function() vim.diagnostic.jump({ count = -1, float = true }) end, opts) - kms('n', 'q', vim.diagnostic.setloclist, opts) - - vim.lsp.config('*', { - capabilities = require('cmp_nvim_lsp').default_capabilities(), - on_attach = function(_, bufnr) - -- Enable completion triggered by - vim.api.nvim_set_option_value('omnifunc', 'v:lua.vim.lsp.omnifunc', { buf = bufnr }) - - -- Mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local bufopts = { noremap = true, silent = true, buffer = bufnr } - local kms = vim.keymap.set - -- goto * - kms('n', 'gD', vim.lsp.buf.declaration, bufopts) - kms('n', 'gd', vim.lsp.buf.definition, bufopts) - kms('n', 'gr', vim.lsp.buf.references, bufopts) - kms('n', 'gi', vim.lsp.buf.implementation, bufopts) - --kms('n', 'D', vim.lsp.buf.type_definition, bufopts) - -- show info - kms('n', 'K', vim.lsp.buf.hover, bufopts) - kms('n', '', vim.lsp.buf.signature_help, bufopts) - -- Workspace - kms('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) - kms('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) - kms('n', 'wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts) - -- operation - kms('n', 'rn', vim.lsp.buf.rename, bufopts) - kms('n', 'ca', vim.lsp.buf.code_action, bufopts) - kms('n', 'f', function() vim.lsp.buf.format { async = true } end, bufopts) - end, - }) - - vim.lsp.config('lua_ls', { - --cmd = { 'lua-language-server.cmd' }, - on_init = function(client) - if client.workspace_folders then - local path = client.workspace_folders[1].name - if - path ~= vim.fn.stdpath('config') - and (vim.uv.fs_stat(path .. '/.luarc.json') or vim.uv.fs_stat(path .. '/.luarc.jsonc')) - then - return - end - end - - client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, { - runtime = { - -- Tell the language server which version of Lua you're using (most - -- likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Tell the language server how to find Lua modules same way as Neovim - -- (see `:h lua-module-load`) - path = { - 'lua/?.lua', - 'lua/?/init.lua', - }, - }, - -- Make the server aware of Neovim runtime files - workspace = { - checkThirdParty = false, - library = { - vim.env.VIMRUNTIME, - -- Depending on the usage, you might want to add additional paths - -- here. - -- '${3rd}/luv/library', - -- '${3rd}/busted/library', - }, - -- Or pull in all of 'runtimepath'. - -- NOTE: this is a lot slower and will cause issues when working on - -- your own configuration. - -- See https://github.com/neovim/nvim-lspconfig/issues/3189 - -- library = vim.api.nvim_get_runtime_file('', true), - }, - }) - end, - }) - vim.lsp.enable('lua_ls') - - vim.lsp.enable('rust_analyzer') - - vim.lsp.config('powershell_es', { - bundle_path = 'D:/DevKits/SDKs/LSP/MasonManaged/packages/powershell-editor-services', - shell = 'powershell.exe', - }) - vim.lsp.enable('powershell_es') - - vim.lsp.config('jsonls', { - capabilities = setmetatable({ - textDocument = { completion = { completionItem = { snippetSupport = true } } } - }, { - __index = require('cmp_nvim_lsp').default_capabilities() - }), - cmd = { 'node.exe', 'D:/DevKits/SDKs/LSP/MasonManaged/packages/json-lsp/node_modules/vscode-langservers-extracted/bin/vscode-json-language-server', '--stdio' }, - }) - vim.lsp.enable('jsonls') -end diff --git a/.config/nvim/lua/plugins/dev.lua b/.config/nvim/lua/plugins/dev.lua deleted file mode 100644 index e81de22..0000000 --- a/.config/nvim/lua/plugins/dev.lua +++ /dev/null @@ -1,94 +0,0 @@ -local mason_root = "D:\\DevKits\\SDKs\\LSP\\MasonManaged" - -return { { - 'mason-org/mason.nvim', - version = '2.*', - cond = jit.os == "Windows", - cmd = { 'Mason', 'MasonUpdate', 'MasonInstall', 'MasonUninstall', 'MasonUninstallAll', 'MasonLog' }, - opts = { - install_root_dir = mason_root, - log_level = vim.log.levels.WARN, - }, -}, { - 'neovim/nvim-lspconfig', - version = '2.*', - event = { 'BufReadPost', 'BufNewFile' }, - config = require('plugins.conf.lsp').config, -}, { - -- 'hrsh7th/nvim-cmp', - -- event = { 'InsertEnter', 'CmdlineEnter' }, - -- dependencies = { - -- 'hrsh7th/cmp-nvim-lsp', - -- 'hrsh7th/cmp-buffer', - -- 'hrsh7th/cmp-path', - -- 'hrsh7th/cmp-cmdline', - -- 'windwp/nvim-autopairs', - -- 'lukas-reineke/cmp-under-comparator', - -- }, - -- config = require('plugins.conf.cmp').config, - -- }, { - 'saghen/blink.cmp', - version = '1.*', - event = { - 'InsertEnter', - -- 'CmdlineEnter', - }, - dependencies = { - 'rafamadriz/friendly-snippets', - }, - opts = require('plugins.conf.cmp').opts, - opts_extend = { 'sources.default' }, -}, { - 'windwp/nvim-autopairs', - version = '*', - event = 'InsertEnter', - opts = { - map_cr = true, - }, -}, { - 'MeanderingProgrammer/render-markdown.nvim', - version = '8.*', - dependencies = { - 'nvim-treesitter/nvim-treesitter', - 'nvim-mini/mini.icons', - }, - keys = { { - 'md', - 'RenderMarkdown preview', - mode = 'n', - ft = { 'markdown', 'quarto' }, - } }, - ft = { 'markdown', 'quarto' }, - opts = { - completions = { lsp = { enabled = true } }, - }, -}, { - "rachartier/tiny-inline-diagnostic.nvim", - event = "LspAttach", - init = function() - vim.diagnostic.config({ virtual_text = false }) - end, - opts = { - options = { - multilines = { enabled = true }, - }, - }, -}, { - 'stevearc/aerial.nvim', - version = '3.*', - dependencies = { - 'nvim-mini/mini.icons', - }, - keys = { - { 'cs', 'AerialToggle' }, - }, - opts = { - backends = { 'lsp', 'markdown', 'asciidoc' }, - layout = { - default_direction = 'right', - }, - ignore = { - filetypes = { 'dashboard' }, - }, - }, -} } diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua deleted file mode 100644 index 684e41e..0000000 --- a/.config/nvim/lua/plugins/ui.lua +++ /dev/null @@ -1,209 +0,0 @@ -return { { - 'nvim-mini/mini.icons', - version = '*', - config = function() - local mini_icons = require('mini.icons') - mini_icons.setup() - mini_icons.mock_nvim_web_devicons() - end, -}, { - 'catppuccin/nvim', - version = '*', - name = 'catppuccin', - lazy = false, - priority = 1000, - init = function() - vim.cmd.colorscheme 'catppuccin-nvim' - end, - opts = { - flavour = 'auto', - background = { - light = 'latte', - dark = 'mocha', - }, - transparent_background = true, - float = { - transparent = false, - solid = false, - }, - term_colors = true, - show_end_of_buffer = false, - integrations = { - cmp = true, - gitsigns = true, - nvimtree = true, - notify = true, - }, - }, -}, { - 'nvimdev/dashboard-nvim', - dependencies = { - 'nvim-mini/mini.icons', - }, - cond = function() return vim.g.neovide ~= nil end, - event = 'VimEnter', - opts = { - theme = "hyper", - change_to_vcs_root = true, - config = { - week_header = { - enable = true, - } - }, - hide = { - statusline = true, - tabline = true, - winbar = true - } - }, - config = function(_, opts) - require('dashboard').setup(opts) - - -- Fix filetype error - vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWinEnter' }, { - callback = function() - if vim.bo.filetype == '' then - vim.cmd('filetype detect') - end - end, - }) - end -}, { - 'Bekaboo/dropbar.nvim', - version = '*', - event = 'LspAttach', - -- optional, but required for fuzzy finder support - config = function() - local dropbar_api = require('dropbar.api') - vim.keymap.set('n', ',,', dropbar_api.pick, { desc = 'Pick symbols in winbar' }) - vim.keymap.set('n', ',h', dropbar_api.goto_context_start, { desc = 'Go to start of current context' }) - vim.keymap.set('n', ',l', dropbar_api.select_next_context, { desc = 'Select next context' }) - end, - dependencies = { - 'nvim-mini/mini.icons', - }, -}, { - 'akinsho/bufferline.nvim', - version = '4.*', - event = 'VeryLazy', - dependencies = { - 'nvim-mini/mini.icons', - }, - config = function() - require('bufferline').setup { - options = { - separator_style = 'slant', - always_show_bufferline = false, - auto_toggle_bufferline = true, - diagnostics = 'nvim_lsp', - } - } - vim.opt.termguicolors = true - end, -}, { - 'nvim-lualine/lualine.nvim', - version = false, - event = 'VeryLazy', - dependencies = { - 'nvim-mini/mini.icons', - }, - opts = { - options = { - theme = 'catppuccin-nvim', - disabled_filetypes = { - statusline = { 'dashboard' }, - winbar = { 'dashboard' }, - }, - ignore_focus = { 'neo-tree', 'aerial' }, - } - }, -}, { - 'rcarriga/nvim-notify', - version = '3.*', - event = 'VeryLazy', - init = function() - vim.notify = require('notify') - end, - opts = { - background_colour = "#000000", - timeout = 5000, - }, -}, { - 'lukas-reineke/indent-blankline.nvim', - version = '3.*', - event = 'LspAttach', - dependencies = { - 'nvim-treesitter/nvim-treesitter', - { - 'HiPhish/rainbow-delimiters.nvim', - submodules = false, - event = { 'BufReadPost', 'BufNewFile' }, - }, - -- 'https://gitlab.com/HiPhish/rainbow-delimiters.nvim.git', - }, - config = function() - local highlight = { - "RainbowRed", - "RainbowYellow", - "RainbowBlue", - "RainbowOrange", - "RainbowGreen", - "RainbowViolet", - "RainbowCyan", - } - local hooks = require('ibl.hooks') - -- create the highlight groups in the highlight setup hook, so they are reset - -- every time the colorscheme changes - hooks.register(hooks.type.HIGHLIGHT_SETUP, function() - vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" }) - vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" }) - vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" }) - vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" }) - vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" }) - vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" }) - vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" }) - end) - - local rainbow_delimiters = require('rainbow-delimiters') - vim.g.rainbow_delimiters = { - strategy = { - [''] = rainbow_delimiters.strategy['global'], - vim = rainbow_delimiters.strategy['local'], - }, - query = { - [''] = 'rainbow-delimiters', - lua = 'rainbow-blocks', - }, - priority = { - [''] = 110, - lua = 210, - }, - highlight = highlight, - } - require('ibl').setup { - scope = { highlight = highlight }, - exclude = { - filetypes = { 'dashboard' }, - }, - } - - hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark) - end, -}, { - 'nvim-neo-tree/neo-tree.nvim', - version = '2.*', - dependencies = { - 'nvim-lua/plenary.nvim', - 'MunifTanjim/nui.nvim', - 'nvim-mini/mini.icons', - }, - keys = { - { '', 'Neotree toggle reveal' }, - }, - opts = {}, -}, { - 'karb94/neoscroll.nvim', - version = false, - event = 'VeryLazy', - opts = {}, -} } diff --git a/.config/nvim/lua/plugins/util.lua b/.config/nvim/lua/plugins/util.lua deleted file mode 100644 index abc51bf..0000000 --- a/.config/nvim/lua/plugins/util.lua +++ /dev/null @@ -1,35 +0,0 @@ -return { { - 'nvim-telescope/telescope.nvim', - version = '*', - cmd = { 'Telescope' }, - dependencies = { - 'nvim-lua/plenary.nvim', - { - 'nvim-telescope/telescope-fzf-native.nvim', - build = - 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release --target install' - }, - }, -}, { - 'mikavilpas/yazi.nvim', - version = '13.*', - -- event = 'VeryLazy', - dependencies = { - { 'nvim-lua/plenary.nvim', lazy = true }, - }, - -- keys = {{ - -- '', 'Yazi', - -- mode = { 'n' }, - -- desc = 'Open yazi at current file', - -- }}, - cmd = { 'Yazi' }, - init = function() - vim.g.loaded_netrwPlugin = 1 - end, - opts = { - open_for_directories = true, - keymaps = { - show_help = '', - }, - }, -} }