From a3ff15795893e7b231c913b9ced2d043a690c564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=88=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=82=D0=BE=D0=BA=D0=B8?= =?UTF-8?q?=D1=9B-=D0=A8=D1=83=D0=BC=D0=B0=D1=80=D0=B0=D1=86?= Date: Thu, 27 Jul 2023 18:24:13 +0200 Subject: [PATCH] Migrated to Lazy.nvim plugin manager --- .gitignore | 1 + init.vim | 67 ++----------- lua/init.lua | 278 +++++++++++++++++++++++++++++++-------------------- 3 files changed, 179 insertions(+), 167 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e033bc6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +lazy-lock.json diff --git a/init.vim b/init.vim index 7e7f9aa..e8c439d 100644 --- a/init.vim +++ b/init.vim @@ -63,59 +63,6 @@ set signcolumn=yes:1 " |__) | | | / _` | |\ | /__` " | |___ \__/ \__> | | \| .__/ - -call plug#begin() - - Plug 'navarasu/onedark.nvim' - Plug 'echasnovski/mini.nvim' - Plug 'nvim-tree/nvim-web-devicons' - Plug 'NvChad/nvim-colorizer.lua' - Plug 'kassio/neoterm' - Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} - Plug 'folke/noice.nvim' - Plug 'MunifTanjim/nui.nvim' - Plug 'SirVer/ultisnips' - Plug 'lervag/vimtex' -" Plug 'williamboman/mason.nvim', { 'do': ':MasonUpdate' } - - -" Plug 'neovim/nvim-lspconfig' -" Plug 'hrsh7th/cmp-nvim-lsp' -" Plug 'hrsh7th/cmp-buffer' -" Plug 'hrsh7th/cmp-path' -" Plug 'hrsh7th/cmp-cmdline' -" Plug 'hrsh7th/nvim-cmp' - -" Plug 'SirVer/ultisnips' -" Plug 'quangnguyen30192/cmp-nvim-ultisnips' - - Plug 'bkad/camelcasemotion' - Plug 'nvim-treesitter.configs' - Plug 'HiPhish/nvim-ts-rainbow2' - - Plug 'nvim-neorg/neorg' - Plug 'nvim-lua/plenary.nvim' - Plug 'tpope/vim-commentary' - - - Plug 'ggandor/lightspeed.nvim' - Plug 'gen740/SmoothCursor.nvim' - - - Plug 'folke/twilight.nvim' - Plug 'folke/zen-mode.nvim' - - Plug 'preservim/nerdtree' - Plug 'tamton-aquib/staline.nvim' - Plug 'nvim-telescope/telescope.nvim', { 'tag': '0.1.2' } - Plug 'nvim-telescope/telescope-file-browser.nvim' - - Plug 'willothy/veil.nvim' - Plug 'chentoast/marks.nvim' - -call plug#end() - - lua require('init') @@ -126,12 +73,12 @@ lua require('init') " .__/ | \| | | | |___ | .__/ -" let g:UltiSnipsExpandTrigger="" -" let g:UltiSnipsJumpForwardTrigger="jk" -" let g:UltiSnipsJumpBackwardTrigger="kj" +let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="jk" +let g:UltiSnipsJumpBackwardTrigger="kj" -" let g:UltiSnipsSnippetDirectories = [$HOME.'/.config/nvim/UltiSnips'] -" let g:UltiSnipsEditSplit = 'context' +let g:UltiSnipsSnippetDirectories = [$HOME.'/.config/nvim/UltiSnips'] +let g:UltiSnipsEditSplit = 'context' @@ -195,3 +142,7 @@ sunmap ge + + + + diff --git a/lua/init.lua b/lua/init.lua index 9d3bff6..1203fc3 100644 --- a/lua/init.lua +++ b/lua/init.lua @@ -4,53 +4,113 @@ +-- LAZY NVIM - require('colorizer').setup() - require('mini.completion').setup() - require('mini.cursorword').setup() - require('mini.pairs').setup() - require('mini.trailspace').setup() - require('mini.hipatterns').setup() - require('mini.indentscope').setup() - require('noice').setup() - require('veil').setup() +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + + +-- require("lazy").setup(plugins, opts) + + + + + +require("lazy").setup({ + + "navarasu/onedark.nvim", + "HiPhish/nvim-ts-rainbow2", + "NvChad/nvim-colorizer.lua", + "folke/noice.nvim", + "gen740/SmoothCursor.nvim", + "folke/twilight.nvim", + "folke/zen-mode.nvim", + "MunifTanjim/nui.nvim", + "nvim-tree/nvim-web-devicons", + "tamton-aquib/staline.nvim", + + "willothy/veil.nvim", + { 'echasnovski/mini.nvim', version = false }, + "kassio/neoterm", + {"nvim-treesitter/nvim-treesitter", build = ":TSUpdate"}, + { "SirVer/ultisnips", lazy = true }, + { "lervag/vimtex", lazy = true }, + + "bkad/camelcasemotion", + "ggandor/lightspeed.nvim", + "chentoast/marks.nvim", + + { "nvim-neorg/neorg", lazy = true }, + "nvim-lua/plenary.nvim", + "tpope/vim-commentary", + + "preservim/nerdtree", + "nvim-telescope/telescope.nvim", + "nvim-telescope/telescope-file-browser.nvim", + + +}) + + + + + +require('colorizer').setup() +require('mini.completion').setup() +require('mini.cursorword').setup() +require('mini.pairs').setup() +require('mini.trailspace').setup() +require('mini.hipatterns').setup() +require('mini.indentscope').setup() +require('noice').setup() +require('veil').setup() -- require('mason').setup() -- require('mini.files').setup() -- require('mini.statusline').setup() -- require('mini.starter').setup() - vim.opt.laststatus=2 +vim.opt.laststatus=2 - vim.keymap.set('i', '', [[pumvisible() ? "\" : "\"]], { expr = true }) - vim.keymap.set('i', '', [[pumvisible() ? "\" : "\"]], { expr = true }) +vim.keymap.set('i', '', [[pumvisible() ? "\" : "\"]], { expr = true }) +vim.keymap.set('i', '', [[pumvisible() ? "\" : "\"]], { expr = true }) - require('nvim-treesitter.configs').setup { - rainbow = { - enable = true, - -- Which query to use for finding delimiters - query = 'rainbow-parens', - -- Highlight the entire buffer all at once - strategy = require('ts-rainbow').strategy.global, - } - } +--require('nvim-treesitter.configs').setup { +-- rainbow = { +-- enable = true, +-- -- Which query to use for finding delimiters +-- query = 'rainbow-parens', +-- -- Highlight the entire buffer all at once +-- strategy = require('ts-rainbow').strategy.global, +-- } +--} - require('neorg').setup { - load = { - ["core.defaults"] = {}, -- Loads default behaviour - ["core.concealer"] = {}, -- Adds pretty icons to your documents - ["core.dirman"] = { -- Manages Neorg workspaces - config = { - workspaces = { - notes = "~/notes", - }, +require('neorg').setup { + load = { + ["core.defaults"] = {}, -- Loads default behaviour + ["core.concealer"] = {}, -- Adds pretty icons to your documents + ["core.dirman"] = { -- Manages Neorg workspaces + config = { + workspaces = { + notes = "~/notes", }, }, }, - } + }, +} @@ -58,90 +118,90 @@ - require('smoothcursor').setup({ - autostart = true, - cursor = "", -- cursor shape (need nerd font) - texthl = "SmoothCursor", -- highlight group, default is { bg = nil, fg = "#FFD400" } - linehl = nil, -- highlight sub-cursor line like 'cursorline', "CursorLine" recommended - type = "default", -- define cursor movement calculate function, "default" or "exp" (exponential). - fancy = { - enable = true, -- enable fancy mode - head = { cursor = "", texthl = "SmoothCursor", linehl = nil }, - body = { - { cursor = "", texthl = "SmoothCursorYellow" }, - { cursor = "", texthl = "SmoothCursorYellow" }, - { cursor = "●", texthl = "SmoothCursorYellow" }, - { cursor = "●", texthl = "SmoothCursorYellow" }, - { cursor = "•", texthl = "SmoothCursorYellow" }, - { cursor = ".", texthl = "SmoothCursorYellow" }, - { cursor = ".", texthl = "SmoothCursorYellow" }, - }, - tail = { cursor = nil, texthl = "SmoothCursor" } +require('smoothcursor').setup({ + autostart = true, + cursor = "", -- cursor shape (need nerd font) + texthl = "SmoothCursor", -- highlight group, default is { bg = nil, fg = "#FFD400" } + linehl = nil, -- highlight sub-cursor line like 'cursorline', "CursorLine" recommended + type = "default", -- define cursor movement calculate function, "default" or "exp" (exponential). + fancy = { + enable = true, -- enable fancy mode + head = { cursor = "", texthl = "SmoothCursor", linehl = nil }, + body = { + { cursor = "", texthl = "SmoothCursorYellow" }, + { cursor = "", texthl = "SmoothCursorYellow" }, + { cursor = "●", texthl = "SmoothCursorYellow" }, + { cursor = "●", texthl = "SmoothCursorYellow" }, + { cursor = "•", texthl = "SmoothCursorYellow" }, + { cursor = ".", texthl = "SmoothCursorYellow" }, + { cursor = ".", texthl = "SmoothCursorYellow" }, }, - flyin_effect = nil, -- "bottom" or "top" - speed = 50, -- max is 100 to stick to your current position - intervals = 25, -- tick interval - priority = 10, -- set marker priority - timeout = 1500, -- timout for animation - threshold = 3, -- animate if threshold lines jump - disable_float_win = false, -- disable on float window - enabled_filetypes = nil, -- example: { "lua", "vim" } - disabled_filetypes = nil, -- this option will be skipped if enabled_filetypes is set. example: { "TelescopePrompt", "NvimTree" } - }) + tail = { cursor = nil, texthl = "SmoothCursor" } + }, + flyin_effect = nil, -- "bottom" or "top" + speed = 50, -- max is 100 to stick to your current position + intervals = 25, -- tick interval + priority = 10, -- set marker priority + timeout = 1500, -- timout for animation + threshold = 3, -- animate if threshold lines jump + disable_float_win = false, -- disable on float window + enabled_filetypes = nil, -- example: { "lua", "vim" } + disabled_filetypes = nil, -- this option will be skipped if enabled_filetypes is set. example: { "TelescopePrompt", "NvimTree" } +}) - require('staline').setup { - defaults = { - expand_null_ls = false, -- This expands out all the null-ls sources to be shown - left_separator = "", - right_separator = "", - full_path = false, - line_column = "[%l/%L] 並%p%% ", -- `:h stl` to see all flags. +require('staline').setup { + defaults = { + expand_null_ls = false, -- This expands out all the null-ls sources to be shown + left_separator = "", + right_separator = "", + full_path = false, + line_column = "[%l/%L] 並%p%% ", -- `:h stl` to see all flags. - fg = "#000000", -- Foreground text color. - bg = "none", -- Default background is transparent. - inactive_color = "#303030", - inactive_bgcolor = "none", - true_colors = true, -- true lsp colors. - font_active = "none", -- "bold", "italic", "bold,italic", etc + fg = "#000000", -- Foreground text color. + bg = "none", -- Default background is transparent. + inactive_color = "#303030", + inactive_bgcolor = "none", + true_colors = true, -- true lsp colors. + font_active = "none", -- "bold", "italic", "bold,italic", etc - mod_symbol = "  ", - lsp_client_symbol = " ", - lsp_client_character_length = 12, -- Shorten LSP client names. - branch_symbol = " ", - cool_symbol = " ", -- Change this to override default OS icon. - null_ls_symbol = "", -- A symbol to indicate that a source is coming from null-ls - }, - mode_colors = { - n = "#4799eb", - i = "#986fec", - c = "#e27d60", - v = "#2bbb4f", -- etc.. - }, - mode_icons = { - n = " Normal", - i = " Insert", - c = " Command", - v = " Visual", -- etc.. - }, - sections = { - left = { '- ', '-mode', 'left_sep_double', ' ', 'branch' }, - mid = { 'file_name' }, - right = { 'cool_symbol','right_sep_double', '-line_column' }, - }, - inactive_sections = { - left = { 'branch' }, - mid = { 'file_name' }, - right = { 'line_column' } - }, - lsp_symbols = { - Error=" ", - Info=" ", - Warn=" ", - Hint="", - }, - } + mod_symbol = "  ", + lsp_client_symbol = " ", + lsp_client_character_length = 12, -- Shorten LSP client names. + branch_symbol = " ", + cool_symbol = " ", -- Change this to override default OS icon. + null_ls_symbol = "", -- A symbol to indicate that a source is coming from null-ls + }, + mode_colors = { + n = "#4799eb", + i = "#986fec", + c = "#e27d60", + v = "#2bbb4f", -- etc.. + }, + mode_icons = { + n = " Normal", + i = " Insert", + c = " Command", + v = " Visual", -- etc.. + }, + sections = { + left = { '- ', '-mode', 'left_sep_double', ' ', 'branch' }, + mid = { 'file_name' }, + right = { 'cool_symbol','right_sep_double', '-line_column' }, + }, + inactive_sections = { + left = { 'branch' }, + mid = { 'file_name' }, + right = { 'line_column' } + }, + lsp_symbols = { + Error=" ", + Info=" ", + Warn=" ", + Hint="", + }, +}