|
|
@ -1,85 +1,85 @@
|
|
|
|
local use = require('packer').use
|
|
|
|
local use = require("packer").use
|
|
|
|
require('packer').startup(function()
|
|
|
|
require("packer").startup(function()
|
|
|
|
-- required
|
|
|
|
-- required
|
|
|
|
use 'wbthomason/packer.nvim'
|
|
|
|
use("wbthomason/packer.nvim")
|
|
|
|
use 'nvim-lua/plenary.nvim'
|
|
|
|
use("nvim-lua/plenary.nvim")
|
|
|
|
|
|
|
|
|
|
|
|
-- common/visual plugins
|
|
|
|
-- common/visual plugins
|
|
|
|
use 'powerline/powerline-fonts'
|
|
|
|
use("powerline/powerline-fonts")
|
|
|
|
use {
|
|
|
|
use({
|
|
|
|
'nvim-lualine/lualine.nvim',
|
|
|
|
"nvim-lualine/lualine.nvim",
|
|
|
|
requires = { 'kyazdani42/nvim-web-devicons', opt = true }
|
|
|
|
requires = { "kyazdani42/nvim-web-devicons", opt = true },
|
|
|
|
}
|
|
|
|
})
|
|
|
|
use 'kdheepak/tabline.nvim'
|
|
|
|
use("kdheepak/tabline.nvim")
|
|
|
|
use 'junegunn/goyo.vim'
|
|
|
|
use("junegunn/goyo.vim")
|
|
|
|
use 'gpanders/editorconfig.nvim'
|
|
|
|
use("gpanders/editorconfig.nvim")
|
|
|
|
use {
|
|
|
|
use({
|
|
|
|
'nvim-telescope/telescope-fzf-native.nvim',
|
|
|
|
"nvim-telescope/telescope-fzf-native.nvim",
|
|
|
|
run = 'make'
|
|
|
|
run = "make",
|
|
|
|
}
|
|
|
|
})
|
|
|
|
use {
|
|
|
|
use({
|
|
|
|
'nvim-telescope/telescope.nvim',
|
|
|
|
"nvim-telescope/telescope.nvim",
|
|
|
|
tag = '0.1.0',
|
|
|
|
tag = "0.1.0",
|
|
|
|
}
|
|
|
|
})
|
|
|
|
use {
|
|
|
|
use({
|
|
|
|
'williamboman/mason.nvim',
|
|
|
|
"williamboman/mason.nvim",
|
|
|
|
'williamboman/mason-lspconfig.nvim',
|
|
|
|
"williamboman/mason-lspconfig.nvim",
|
|
|
|
'RubixDev/mason-update-all',
|
|
|
|
"RubixDev/mason-update-all",
|
|
|
|
'neovim/nvim-lspconfig'
|
|
|
|
"neovim/nvim-lspconfig",
|
|
|
|
}
|
|
|
|
})
|
|
|
|
use {
|
|
|
|
use({
|
|
|
|
'catppuccin/nvim',
|
|
|
|
"catppuccin/nvim",
|
|
|
|
as = 'catpuccin'
|
|
|
|
as = "catpuccin",
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
use 'nvim-treesitter/nvim-treesitter'
|
|
|
|
use("nvim-treesitter/nvim-treesitter")
|
|
|
|
|
|
|
|
|
|
|
|
use 'jose-elias-alvarez/null-ls.nvim'
|
|
|
|
use("jose-elias-alvarez/null-ls.nvim")
|
|
|
|
|
|
|
|
|
|
|
|
use 'RRethy/vim-illuminate'
|
|
|
|
use("RRethy/vim-illuminate")
|
|
|
|
|
|
|
|
|
|
|
|
-- cmp
|
|
|
|
-- cmp
|
|
|
|
use "hrsh7th/nvim-cmp"
|
|
|
|
use("hrsh7th/nvim-cmp")
|
|
|
|
use "hrsh7th/cmp-buffer"
|
|
|
|
use("hrsh7th/cmp-buffer")
|
|
|
|
use "hrsh7th/cmp-path"
|
|
|
|
use("hrsh7th/cmp-path")
|
|
|
|
use "hrsh7th/cmp-nvim-lsp"
|
|
|
|
use("hrsh7th/cmp-nvim-lsp")
|
|
|
|
use 'L3MON4D3/LuaSnip'
|
|
|
|
use("L3MON4D3/LuaSnip")
|
|
|
|
use 'saadparwaiz1/cmp_luasnip'
|
|
|
|
use("saadparwaiz1/cmp_luasnip")
|
|
|
|
use "hrsh7th/cmp-nvim-lua"
|
|
|
|
use("hrsh7th/cmp-nvim-lua")
|
|
|
|
|
|
|
|
|
|
|
|
-- indent lines
|
|
|
|
-- indent lines
|
|
|
|
use "lukas-reineke/indent-blankline.nvim"
|
|
|
|
use("lukas-reineke/indent-blankline.nvim")
|
|
|
|
|
|
|
|
|
|
|
|
end)
|
|
|
|
end)
|
|
|
|
|
|
|
|
|
|
|
|
require("user.basics")
|
|
|
|
require("user.basics")
|
|
|
|
|
|
|
|
|
|
|
|
vim.cmd.colorscheme 'catppuccin-macchiato'
|
|
|
|
vim.cmd.colorscheme("catppuccin-macchiato")
|
|
|
|
vim.opt.guicursor = 'n:block-Number,i:ver30'
|
|
|
|
vim.opt.guicursor = "n:block-Number,i:ver30"
|
|
|
|
|
|
|
|
|
|
|
|
local function map(mode, shortcut, command)
|
|
|
|
local function map(mode, shortcut, command)
|
|
|
|
vim.keymap.set(mode, shortcut, command, { noremap = true })
|
|
|
|
vim.keymap.set(mode, shortcut, command, { noremap = true })
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
local function nmap(shortcut, command)
|
|
|
|
local function nmap(shortcut, command)
|
|
|
|
map('n', shortcut, command)
|
|
|
|
map("n", shortcut, command)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
local use builtin = require("telescope.builtin")
|
|
|
|
local use
|
|
|
|
|
|
|
|
builtin = require("telescope.builtin")
|
|
|
|
nmap("<C-P>", builtin.find_files)
|
|
|
|
nmap("<C-P>", builtin.find_files)
|
|
|
|
|
|
|
|
|
|
|
|
require("lualine").setup{
|
|
|
|
require("lualine").setup({
|
|
|
|
options = {
|
|
|
|
options = {
|
|
|
|
theme = 'auto'
|
|
|
|
theme = "auto",
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
require("tabline").setup{
|
|
|
|
require("tabline").setup({
|
|
|
|
vim.cmd([[
|
|
|
|
vim.cmd([[
|
|
|
|
set guioptions-=e
|
|
|
|
set guioptions-=e
|
|
|
|
set sessionoptions+=tabpages,globals
|
|
|
|
set sessionoptions+=tabpages,globals
|
|
|
|
]])
|
|
|
|
]]),
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
local status_ok, configs = pcall(require, "nvim-treesitter.configs")
|
|
|
|
local status_ok, configs = pcall(require, "nvim-treesitter.configs")
|
|
|
|
if not status_ok then
|
|
|
|
if not status_ok then
|
|
|
@ -95,18 +95,20 @@ configs.setup({
|
|
|
|
disable = { "" },
|
|
|
|
disable = { "" },
|
|
|
|
additional_vim_regex_highlighting = true,
|
|
|
|
additional_vim_regex_highlighting = true,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
indent = { enable = true, disable = { "yaml" } }
|
|
|
|
indent = { enable = true, disable = { "yaml" } },
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
-- indent blankline plugin
|
|
|
|
-- indent blankline plugin
|
|
|
|
vim.opt.list = true
|
|
|
|
vim.opt.list = true
|
|
|
|
vim.opt.listchars:append "space:⋅"
|
|
|
|
vim.opt.listchars:append("space:⋅")
|
|
|
|
vim.opt.listchars:append "eol:↴"
|
|
|
|
vim.opt.listchars:append("eol:↴")
|
|
|
|
require("indent_blankline").setup {
|
|
|
|
---require("ibl").setup({
|
|
|
|
show_end_of_line = true,
|
|
|
|
--- show_end_of_line = true,
|
|
|
|
show_current_context = true,
|
|
|
|
--- show_current_context = true,
|
|
|
|
show_current_context_start = true,
|
|
|
|
--- show_current_context_start = true,
|
|
|
|
}
|
|
|
|
---})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
require("ibl").setup()
|
|
|
|
|
|
|
|
|
|
|
|
nmap("<C-T>", "<cmd>TablineTabNew<cr>")
|
|
|
|
nmap("<C-T>", "<cmd>TablineTabNew<cr>")
|
|
|
|
nmap("<C-L>", "<cmd>TablineBufferNext<cr>")
|
|
|
|
nmap("<C-L>", "<cmd>TablineBufferNext<cr>")
|
|
|
@ -116,6 +118,5 @@ nmap("<C-S-Q>", "<cmd>bd!<cr>")
|
|
|
|
nmap("<C-B>", "<cmd>ls<cr>")
|
|
|
|
nmap("<C-B>", "<cmd>ls<cr>")
|
|
|
|
nmap("<C-G>", "<cmd>Goyo<cr>")
|
|
|
|
nmap("<C-G>", "<cmd>Goyo<cr>")
|
|
|
|
|
|
|
|
|
|
|
|
require('user.cmp')
|
|
|
|
require("user.cmp")
|
|
|
|
require('user.lsp')
|
|
|
|
require("user.lsp")
|
|
|
|
|
|
|
|
|
|
|
|