From 26e99614c8a17c90cccf1aa2d949857b7aa0679f Mon Sep 17 00:00:00 2001 From: Youcef Mez Date: Sun, 29 Oct 2023 21:04:35 +0100 Subject: [PATCH] added neosolarized & everforest --- .gitignore | 1 + lazyvim.json | 3 ++- lua/config/NeoSolarized | 10 ++++++++ lua/config/autocmds.lua | 13 ++++++++++ lua/config/everforest | 51 +++++++++++++++++++++++++++++++++++++ lua/plugins/colorscheme.lua | 5 +++- 6 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 lua/config/NeoSolarized create mode 100644 lua/config/everforest diff --git a/.gitignore b/.gitignore index cc5457a..ed1d552 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ debug foo.* *.log data +lazy-lock.json diff --git a/lazyvim.json b/lazyvim.json index 34517b3..42450e5 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -4,6 +4,7 @@ "lazyvim.plugins.extras.editor.symbols-outline", "lazyvim.plugins.extras.formatting.prettier", "lazyvim.plugins.extras.lang.go", + "lazyvim.plugins.extras.lang.java", "lazyvim.plugins.extras.lang.tailwind", "lazyvim.plugins.extras.lang.typescript", "lazyvim.plugins.extras.linting.eslint", @@ -14,4 +15,4 @@ "NEWS.md": "2123" }, "version": 2 -} \ No newline at end of file +} diff --git a/lua/config/NeoSolarized b/lua/config/NeoSolarized new file mode 100644 index 0000000..794502f --- /dev/null +++ b/lua/config/NeoSolarized @@ -0,0 +1,10 @@ +local neosolarized = require("NeoSolarized") +neosolarized.setup({ + options = { + theme = 'NeoSolarized' + lazy = false, -- make sure we load this during startup if it is your main colorscheme + priority = 1000, -- make sure to load this before all the other start plugins + config = function() + vim.cmd([[ colorscheme NeoSolarized ]]) + end, +}) diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua index 27e9e06..0e782b5 100644 --- a/lua/config/autocmds.lua +++ b/lua/config/autocmds.lua @@ -1,3 +1,16 @@ -- Autocmds are automatically loaded on the VeryLazy event -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua -- Add any additional autocmds here +-- Check if we need to reload the file when it changed +-- vim.cmd("set laststatus=0") +-- vim.api.nvim_create_autocmd("statusline", { +-- command = "set laststatus=0", +-- }) +-- vim.api.nvim_create_autocmd("User", { +-- pattern = "LazyDone", +-- once = true, +-- callback = function() +-- vim.api.nvim_exec_autocmds(":set laststatus = 0", { pattern = "*" }) +-- -- vim.notify("Update/Sync/Something is complete!") +-- end, +-- }) diff --git a/lua/config/everforest b/lua/config/everforest new file mode 100644 index 0000000..fec995c --- /dev/null +++ b/lua/config/everforest @@ -0,0 +1,51 @@ +require("everforest").setup({ + ---Controls the "hardness" of the background. Options are "soft", "medium" or "hard". + ---Default is "medium". + background = "hard", + ---How much of the background should be transparent. 2 will have more UI + ---components be transparent (e.g. status line background) + transparent_background_level = 0, + ---Whether italics should be used for keywords and more. + italics = false, + ---Disable italic fonts for comments. Comments are in italics by default, set + ---this to `true` to make them _not_ italic! + disable_italic_comments = false, + ---By default, the colour of the sign column background is the same as the as normal text + ---background, but you can use a grey background by setting this to `"grey"`. + sign_column_background = "none", + ---The contrast of line numbers, indent lines, etc. Options are `"high"` or + ---`"low"` (default). + ui_contrast = "low", + ---Dim inactive windows. Only works in Neovim. Can look a bit weird with Telescope. + --- + ---When this option is used in conjunction with show_eob set to `false`, the + ---end of the buffer will only be hidden inside the active window. Inside + ---inactive windows, the end of buffer filler characters will be visible in + ---dimmed symbols. This is due to the way Vim and Neovim handle `EndOfBuffer`. + dim_inactive_windows = false, + ---Some plugins support highlighting error/warning/info/hint texts, by + ---default these texts are only underlined, but you can use this option to + ---also highlight the background of them. + diagnostic_text_highlight = false, + ---Which colour the diagnostic text should be. Options are `"grey"` or `"coloured"` (default) + diagnostic_virtual_text = "coloured", + ---Some plugins support highlighting error/warning/info/hint lines, but this + ---feature is disabled by default in this colour scheme. + diagnostic_line_highlight = false, + ---By default, this color scheme won't colour the foreground of |spell|, instead + ---colored under curls will be used. If you also want to colour the foreground, + ---set this option to `true`. + spell_foreground = false, + ---Whether to show the EndOfBuffer highlight. + show_eob = true, + ---You can override specific highlights to use other groups or a hex colour. + ---This function will be called with the highlights and colour palette tables. + ---@param highlight_groups Highlights + ---@param palette Palette + on_highlights = function(highlight_groups, palette) end, + ---You can override colours in the palette to use different hex colours. + ---This function will be called once the base and background colours have + ---been mixed on the palette. + ---@param palette Palette + colours_override = function(palette) end, +}) diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index e0f9522..278d284 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -10,10 +10,13 @@ return { { "savq/melange-nvim" }, -- {"cpea2506/one_monokai.nvim"}, { "Mofiqul/vscode.nvim" }, + -- { "Tsuzat/NeoSolarized.nvim" }, + -- { "neanias/everforest-nvim" }, + -- { "ray-x/starry.nvim" }, { "LazyVim/LazyVim", opts = { - colorscheme = "gruvbox", + colorscheme = "vscode", -- colorscheme = "monokai", -- colorscheme = "melange", -- transparent = true,