|
|
|
@ -1,5 +1,5 @@
|
|
|
|
|
diff --git a/init.lua b/init.lua
|
|
|
|
|
index 99c7c9c..4e49b43 100644
|
|
|
|
|
index 5cac3d1..813b1b4 100644
|
|
|
|
|
--- a/init.lua
|
|
|
|
|
+++ b/init.lua
|
|
|
|
|
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
|
|
|
|
@ -39,7 +39,7 @@ index 99c7c9c..4e49b43 100644
|
|
|
|
|
-- [[ Basic Keymaps ]]
|
|
|
|
|
-- See `:help vim.keymap.set()`
|
|
|
|
|
|
|
|
|
|
@@ -639,6 +647,27 @@ require('lazy').setup({
|
|
|
|
|
@@ -671,6 +679,27 @@ require('lazy').setup({
|
|
|
|
|
-- ts_ls = {},
|
|
|
|
|
--
|
|
|
|
|
|
|
|
|
@ -67,7 +67,7 @@ index 99c7c9c..4e49b43 100644
|
|
|
|
|
lua_ls = {
|
|
|
|
|
-- cmd = { ... },
|
|
|
|
|
-- filetypes = { ... },
|
|
|
|
|
@@ -653,6 +682,32 @@ require('lazy').setup({
|
|
|
|
|
@@ -685,6 +714,32 @@ require('lazy').setup({
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
@ -100,7 +100,7 @@ index 99c7c9c..4e49b43 100644
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-- Ensure the servers and tools above are installed
|
|
|
|
|
@@ -682,6 +737,33 @@ require('lazy').setup({
|
|
|
|
|
@@ -716,6 +771,33 @@ require('lazy').setup({
|
|
|
|
|
-- by the server configuration above. Useful when disabling
|
|
|
|
|
-- certain features of an LSP (for example, turning off formatting for ts_ls)
|
|
|
|
|
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
|
|
|
|
@ -134,7 +134,7 @@ index 99c7c9c..4e49b43 100644
|
|
|
|
|
require('lspconfig')[server_name].setup(server)
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
|
@@ -840,6 +922,7 @@ require('lazy').setup({
|
|
|
|
|
@@ -875,6 +957,7 @@ require('lazy').setup({
|
|
|
|
|
-- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
|
|
|
|
|
group_index = 0,
|
|
|
|
|
},
|
|
|
|
@ -142,28 +142,51 @@ index 99c7c9c..4e49b43 100644
|
|
|
|
|
{ name = 'nvim_lsp' },
|
|
|
|
|
{ name = 'luasnip' },
|
|
|
|
|
{ name = 'path' },
|
|
|
|
|
@@ -854,12 +937,19 @@ require('lazy').setup({
|
|
|
|
|
@@ -890,19 +973,37 @@ 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',
|
|
|
|
|
+ 'rjshkhr/shadow.nvim'
|
|
|
|
|
+ 'rjshkhr/shadow.nvim',
|
|
|
|
|
+ 'sainnhe/gruvbox-material',
|
|
|
|
|
+ },
|
|
|
|
|
priority = 1000, -- Make sure to load this before all the other start plugins.
|
|
|
|
|
init = function()
|
|
|
|
|
config = function()
|
|
|
|
|
---@diagnostic disable-next-line: missing-fields
|
|
|
|
|
- require('tokyonight').setup {
|
|
|
|
|
- styles = {
|
|
|
|
|
- comments = { italic = false }, -- Disable italics in comments
|
|
|
|
|
- },
|
|
|
|
|
- }
|
|
|
|
|
+ -- require('tokyonight').setup {
|
|
|
|
|
+ -- styles = {
|
|
|
|
|
+ -- comments = { italic = false }, -- Disable italics in comments
|
|
|
|
|
+ -- },
|
|
|
|
|
+ -- }
|
|
|
|
|
|
|
|
|
|
-- 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 'shadow'
|
|
|
|
|
+ -- gruvbox-material configuration based on https://github.com/gonstoll/dotfiles/blob/2d7ec07bd475c73e7ba1a48b27a2a85315bfd2d1/.config/nvim/lua/plugins/colorscheme/gruvbox.lua#L5-L13
|
|
|
|
|
+ vim.g.gruvbox_material_better_performance = 1
|
|
|
|
|
+ vim.g.gruvbox_material_foreground = 'material'
|
|
|
|
|
+ vim.g.gruvbox_material_background = 'medium'
|
|
|
|
|
+ vim.g.gruvbox_material_ui_contrast = 'low'
|
|
|
|
|
+ vim.g.gruvbox_material_float_style = 'dim'
|
|
|
|
|
+ vim.g.gruvbox_material_enable_italic = 0
|
|
|
|
|
+ vim.g.gruvbox_material_disable_italic_comment = 1
|
|
|
|
|
+ vim.g.gruvbox_material_cursor = 'red'
|
|
|
|
|
+ vim.g.gruvbox_material_disable_terminal_colors = 1
|
|
|
|
|
+ vim.cmd.colorscheme 'gruvbox-material'
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
-- You can configure highlights by doing something like:
|
|
|
|
|
vim.cmd.hi 'Comment gui=none'
|
|
|
|
|
@@ -912,7 +1002,39 @@ require('lazy').setup({
|
|
|
|
|
@@ -952,7 +1053,39 @@ require('lazy').setup({
|
|
|
|
|
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
|
|
|
|
|
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
|
|
|
|
|
opts = {
|
|
|
|
@ -204,7 +227,7 @@ index 99c7c9c..4e49b43 100644
|
|
|
|
|
-- Autoinstall languages that are not installed
|
|
|
|
|
auto_install = true,
|
|
|
|
|
highlight = {
|
|
|
|
|
@@ -942,17 +1064,17 @@ require('lazy').setup({
|
|
|
|
|
@@ -982,17 +1115,17 @@ require('lazy').setup({
|
|
|
|
|
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
|
|
|
|
|
--
|
|
|
|
|
-- require 'kickstart.plugins.debug',
|
|
|
|
|