update config

main
Zynh0722 2023-03-18 23:49:58 -07:00
parent 4272fbca0b
commit 1187947f5c
7 changed files with 83 additions and 30 deletions

View File

@ -1,2 +1,6 @@
-- Enable Comment.nvim -- Enable Comment.nvim
require('Comment').setup() require('Comment').setup({
options = {
theme = 'rose-pine'
}
})

View File

@ -1 +1,2 @@
vim.keymap.set("n", "<leader>gs", vim.cmd.Git) vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
vim.keymap.set("n", "<leader>fo", function() vim.cmd('Git pull') end)

View File

@ -1,10 +1,17 @@
-- Set lualine as statusline -- local theme = require("lualine.themes.rose-pine")
-- See `:help lualine.txt` -- local modes = { "normal", "insert", "visual", "replace", "command", "inactive" }
require('lualine').setup { -- for _, mode in ipairs(modes) do
options = { -- theme[mode].c.bg = "NONE"
icons_enabled = false, -- end
theme = 'onedark', --
component_separators = '|', --
section_separators = '', -- -- Set lualine as statusline
}, -- -- See `:help lualine.txt`
} -- require('lualine').setup {
-- options = {
-- icons_enabled = false,
-- theme = 'rose-pine',
-- component_separators = '|',
-- section_separators = '',
-- },
-- }

View File

@ -1,7 +1,12 @@
require('rose-pine').setup({ -- require('rose-pine').setup({
groups = { -- groups = {
background = 'none' -- background = 'none'
} -- },
}) -- highlight_groups = {
-- MsgArea = { bg = 'none' },
vim.cmd('colorscheme rose-pine') -- }
-- })
--
-- vim.cmd('colorscheme rose-pine')
--
--

View File

@ -1,4 +1,5 @@
local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true }) local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
vim.g.netrw_list_hide = ".DS_Store"
vim.api.nvim_create_autocmd('TextYankPost', { vim.api.nvim_create_autocmd('TextYankPost', {
callback = function() callback = function()
vim.highlight.on_yank() vim.highlight.on_yank()

View File

@ -19,6 +19,18 @@ return require('packer').startup(function(use)
use { use {
'rose-pine/neovim', 'rose-pine/neovim',
as = 'rose-pine', as = 'rose-pine',
config = function()
require('rose-pine').setup({
groups = {
background = 'none'
},
highlight_groups = {
MsgArea = { bg = 'none' },
}
})
vim.cmd('colorscheme rose-pine')
end
} }
use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
@ -34,29 +46,52 @@ return require('packer').startup(function(use)
use 'tpope/vim-fugitive' use 'tpope/vim-fugitive'
use 'lewis6991/gitsigns.nvim' use 'lewis6991/gitsigns.nvim'
use 'nvim-lualine/lualine.nvim' -- Fancier statusline use {
use 'numToStr/Comment.nvim' -- "gc" to comment visual regions/lines 'nvim-lualine/lualine.nvim',
after = 'rose-pine',
config = function()
local theme = require("lualine.themes.rose-pine")
local modes = { "normal", "insert", "visual", "replace", "command", "inactive" }
for _, mode in ipairs(modes) do
theme[mode].c.bg = "none"
end
use 'windwp/nvim-ts-autotag' -- autoclose html tags
-- Set lualine as statusline
-- See `:help lualine.txt`
require('lualine').setup {
options = {
icons_enabled = false,
theme = 'rose-pine',
component_separators = '|',
section_separators = '',
},
}
end
} -- Fancier statusline
use 'numToStr/Comment.nvim' -- "gc" to comment visual regions/lines
use 'windwp/nvim-ts-autotag' -- autoclose html tags
use { use {
'VonHeikemen/lsp-zero.nvim', 'VonHeikemen/lsp-zero.nvim',
requires = { requires = {
-- LSP Support -- LSP Support
{ 'neovim/nvim-lspconfig' }, -- Required { 'neovim/nvim-lspconfig' }, -- Required
{ 'williamboman/mason.nvim' }, -- Optional { 'williamboman/mason.nvim' }, -- Optional
{ 'williamboman/mason-lspconfig.nvim' }, -- Optional { 'williamboman/mason-lspconfig.nvim' }, -- Optional
-- Autocompletion -- Autocompletion
{ 'hrsh7th/nvim-cmp' }, -- Required { 'hrsh7th/nvim-cmp' }, -- Required
{ 'hrsh7th/cmp-nvim-lsp' }, -- Required { 'hrsh7th/cmp-nvim-lsp' }, -- Required
{ 'hrsh7th/cmp-buffer' }, -- Optional { 'hrsh7th/cmp-buffer' }, -- Optional
{ 'hrsh7th/cmp-path' }, -- Optional { 'hrsh7th/cmp-path' }, -- Optional
{ 'saadparwaiz1/cmp_luasnip' }, -- Optional { 'saadparwaiz1/cmp_luasnip' }, -- Optional
{ 'hrsh7th/cmp-nvim-lua' }, -- Optional { 'hrsh7th/cmp-nvim-lua' }, -- Optional
-- Snippets -- Snippets
{ 'L3MON4D3/LuaSnip' }, -- Required { 'L3MON4D3/LuaSnip' }, -- Required
{ 'rafamadriz/friendly-snippets' }, -- Optional { 'rafamadriz/friendly-snippets' }, -- Optional
} }
} }

View File

@ -29,7 +29,7 @@ vim.opt.isfname:append("@-@")
vim.opt.updatetime = 50 vim.opt.updatetime = 50
vim.opt.colorcolumn = "80" vim.opt.colorcolumn = "80,120"
vim.opt.conceallevel = 2 vim.opt.conceallevel = 2