merge: updates from upstream

This commit is contained in:
João Paulo Dubas 2025-02-09 20:08:23 +00:00
commit 20d50a9290
Signed by: joao.dubas
SSH Key Fingerprint: SHA256:V1mixgOGRc/YMhGx/DNkOSmJxgA2vHNrDZEk3wt/kOA

View File

@ -1,5 +1,5 @@
diff --git a/init.lua b/init.lua
index 4eae8e7..ab4f5f6 100644
index 4eae8e7..b9f7554 100644
--- a/init.lua
+++ b/init.lua
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
@ -134,7 +134,28 @@ index 4eae8e7..ab4f5f6 100644
require('lspconfig')[server_name].setup(server)
end,
},
@@ -902,7 +984,39 @@ require('lazy').setup({
@@ -844,12 +926,19 @@ require('lazy').setup({
--
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
'folke/tokyonight.nvim',
+ dependencies = {
+ 'drewxs/ash.nvim',
+ 'wnkz/monoglow.nvim',
+ },
priority = 1000, -- Make sure to load this before all the other start plugins.
init = function()
-- Load the colorscheme here.
-- Like many other themes, this one has different styles, and you could load
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
- vim.cmd.colorscheme 'tokyonight-night'
+ -- For monoglow the following variants area available:
+ -- 'monoglow-z', 'monoglow-lack', or 'monoglow-void'.
+ -- vim.cmd.colorscheme 'tokyonight-night'
+ vim.cmd.colorscheme 'ash'
-- You can configure highlights by doing something like:
vim.cmd.hi 'Comment gui=none'
@@ -902,7 +991,39 @@ require('lazy').setup({
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
opts = {
@ -175,7 +196,7 @@ index 4eae8e7..ab4f5f6 100644
-- Autoinstall languages that are not installed
auto_install = true,
highlight = {
@@ -932,17 +1046,17 @@ require('lazy').setup({
@@ -932,17 +1053,17 @@ require('lazy').setup({
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
--
-- require 'kickstart.plugins.debug',