brk/trixy
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 2 Wiki Activity

Migrated to Lazy.nvim plugin manager

Browse source
This commit is contained in:
Јован Ђокић-Шумарац 2023-07-27 18:24:13 +02:00
parent d3e868c115
commit a3ff157958
3 changed files with 179 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
lazy-lock.json

67
init.vim
View file

@ -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') lua require('init')
@ -126,12 +73,12 @@ lua require('init')
" .__/ | \| | | | |___ | .__/ " .__/ | \| | | | |___ | .__/
" let g:UltiSnipsExpandTrigger="<tab>" let g:UltiSnipsExpandTrigger="<tab>"
" let g:UltiSnipsJumpForwardTrigger="jk" let g:UltiSnipsJumpForwardTrigger="jk"
" let g:UltiSnipsJumpBackwardTrigger="kj" let g:UltiSnipsJumpBackwardTrigger="kj"
" let g:UltiSnipsSnippetDirectories = [$HOME.'/.config/nvim/UltiSnips'] let g:UltiSnipsSnippetDirectories = [$HOME.'/.config/nvim/UltiSnips']
" let g:UltiSnipsEditSplit = 'context' let g:UltiSnipsEditSplit = 'context'
@ -195,3 +142,7 @@ sunmap ge

278
lua/init.lua
View file

@ -4,53 +4,113 @@
-- LAZY NVIM
require('colorizer').setup() local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
require('mini.completion').setup() if not vim.loop.fs_stat(lazypath) then
require('mini.cursorword').setup() vim.fn.system({
require('mini.pairs').setup() "git",
require('mini.trailspace').setup() "clone",
require('mini.hipatterns').setup() "--filter=blob:none",
require('mini.indentscope').setup() "https://github.com/folke/lazy.nvim.git",
require('noice').setup() "--branch=stable", -- latest stable release
require('veil').setup() 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('mason').setup()
-- require('mini.files').setup() -- require('mini.files').setup()
-- require('mini.statusline').setup() -- require('mini.statusline').setup()
-- require('mini.starter').setup() -- require('mini.starter').setup()
vim.opt.laststatus=2 vim.opt.laststatus=2
vim.keymap.set('i', '<Tab>', [[pumvisible() ? "\<C-n>" : "\<Tab>"]], { expr = true }) vim.keymap.set('i', '<Tab>', [[pumvisible() ? "\<C-n>" : "\<Tab>"]], { expr = true })
vim.keymap.set('i', '<S-Tab>', [[pumvisible() ? "\<C-p>" : "\<S-Tab>"]], { expr = true }) vim.keymap.set('i', '<S-Tab>', [[pumvisible() ? "\<C-p>" : "\<S-Tab>"]], { expr = true })
require('nvim-treesitter.configs').setup { --require('nvim-treesitter.configs').setup {
rainbow = { -- rainbow = {
enable = true, -- enable = true,
-- Which query to use for finding delimiters -- -- Which query to use for finding delimiters
query = 'rainbow-parens', -- query = 'rainbow-parens',
-- Highlight the entire buffer all at once -- -- Highlight the entire buffer all at once
strategy = require('ts-rainbow').strategy.global, -- strategy = require('ts-rainbow').strategy.global,
} -- }
} --}
require('neorg').setup { require('neorg').setup {
load = { load = {
["core.defaults"] = {}, -- Loads default behaviour ["core.defaults"] = {}, -- Loads default behaviour
["core.concealer"] = {}, -- Adds pretty icons to your documents ["core.concealer"] = {}, -- Adds pretty icons to your documents
["core.dirman"] = { -- Manages Neorg workspaces ["core.dirman"] = { -- Manages Neorg workspaces
config = { config = {
workspaces = { workspaces = {
notes = "~/notes", notes = "~/notes",
},
}, },
}, },
}, },
} },
}
@ -58,90 +118,90 @@
require('smoothcursor').setup({ require('smoothcursor').setup({
autostart = true, autostart = true,
cursor = "", -- cursor shape (need nerd font) cursor = "", -- cursor shape (need nerd font)
texthl = "SmoothCursor", -- highlight group, default is { bg = nil, fg = "#FFD400" } texthl = "SmoothCursor", -- highlight group, default is { bg = nil, fg = "#FFD400" }
linehl = nil, -- highlight sub-cursor line like 'cursorline', "CursorLine" recommended linehl = nil, -- highlight sub-cursor line like 'cursorline', "CursorLine" recommended
type = "default", -- define cursor movement calculate function, "default" or "exp" (exponential). type = "default", -- define cursor movement calculate function, "default" or "exp" (exponential).
fancy = { fancy = {
enable = true, -- enable fancy mode enable = true, -- enable fancy mode
head = { cursor = "", texthl = "SmoothCursor", linehl = nil }, head = { cursor = "", texthl = "SmoothCursor", linehl = nil },
body = { body = {
{ cursor = "", texthl = "SmoothCursorYellow" }, { cursor = "", texthl = "SmoothCursorYellow" },
{ cursor = "", texthl = "SmoothCursorYellow" }, { cursor = "", texthl = "SmoothCursorYellow" },
{ cursor = "●", texthl = "SmoothCursorYellow" }, { cursor = "●", texthl = "SmoothCursorYellow" },
{ cursor = "●", texthl = "SmoothCursorYellow" }, { 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" }
}, },
flyin_effect = nil, -- "bottom" or "top" tail = { cursor = nil, texthl = "SmoothCursor" }
speed = 50, -- max is 100 to stick to your current position },
intervals = 25, -- tick interval flyin_effect = nil, -- "bottom" or "top"
priority = 10, -- set marker priority speed = 50, -- max is 100 to stick to your current position
timeout = 1500, -- timout for animation intervals = 25, -- tick interval
threshold = 3, -- animate if threshold lines jump priority = 10, -- set marker priority
disable_float_win = false, -- disable on float window timeout = 1500, -- timout for animation
enabled_filetypes = nil, -- example: { "lua", "vim" } threshold = 3, -- animate if threshold lines jump
disabled_filetypes = nil, -- this option will be skipped if enabled_filetypes is set. example: { "TelescopePrompt", "NvimTree" } 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 { require('staline').setup {
defaults = { defaults = {
expand_null_ls = false, -- This expands out all the null-ls sources to be shown expand_null_ls = false, -- This expands out all the null-ls sources to be shown
left_separator = "", left_separator = "",
right_separator = "", right_separator = "",
full_path = false, full_path = false,
line_column = "[%l/%L] 並%p%% ", -- `:h stl` to see all flags. line_column = "[%l/%L] 並%p%% ", -- `:h stl` to see all flags.
fg = "#000000", -- Foreground text color. fg = "#000000", -- Foreground text color.
bg = "none", -- Default background is transparent. bg = "none", -- Default background is transparent.
inactive_color = "#303030", inactive_color = "#303030",
inactive_bgcolor = "none", inactive_bgcolor = "none",
true_colors = true, -- true lsp colors. true_colors = true, -- true lsp colors.
font_active = "none", -- "bold", "italic", "bold,italic", etc font_active = "none", -- "bold", "italic", "bold,italic", etc
mod_symbol = "", mod_symbol = "",
lsp_client_symbol = "", lsp_client_symbol = "",
lsp_client_character_length = 12, -- Shorten LSP client names. lsp_client_character_length = 12, -- Shorten LSP client names.
branch_symbol = "", branch_symbol = "",
cool_symbol = "", -- Change this to override default OS icon. cool_symbol = "", -- Change this to override default OS icon.
null_ls_symbol = "", -- A symbol to indicate that a source is coming from null-ls null_ls_symbol = "", -- A symbol to indicate that a source is coming from null-ls
}, },
mode_colors = { mode_colors = {
n = "#4799eb", n = "#4799eb",
i = "#986fec", i = "#986fec",
c = "#e27d60", c = "#e27d60",
v = "#2bbb4f", -- etc.. v = "#2bbb4f", -- etc..
}, },
mode_icons = { mode_icons = {
n = " Normal", n = " Normal",
i = " Insert", i = " Insert",
c = " Command", c = " Command",
v = " Visual", -- etc.. v = " Visual", -- etc..
}, },
sections = { sections = {
left = { '- ', '-mode', 'left_sep_double', ' ', 'branch' }, left = { '- ', '-mode', 'left_sep_double', ' ', 'branch' },
mid = { 'file_name' }, mid = { 'file_name' },
right = { 'cool_symbol','right_sep_double', '-line_column' }, right = { 'cool_symbol','right_sep_double', '-line_column' },
}, },
inactive_sections = { inactive_sections = {
left = { 'branch' }, left = { 'branch' },
mid = { 'file_name' }, mid = { 'file_name' },
right = { 'line_column' } right = { 'line_column' }
}, },
lsp_symbols = { lsp_symbols = {
Error="", Error="",
Info="", Info="",
Warn="", Warn="",
Hint="", Hint="",
}, },
} }