Skip to content

Commit

Permalink
Fixed themes
Browse files Browse the repository at this point in the history
  • Loading branch information
crivotz committed Feb 22, 2024
1 parent cb9d1e8 commit e735076
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 27 deletions.
12 changes: 6 additions & 6 deletions lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
"lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "7897c45e8f0f7fefe3b3ee00d8e89dc67a113e25" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "60f6805b12a12e8a912aeb2f975dec1794a8994e" },
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
"multicursors.nvim": { "branch": "main", "commit": "8e876fe9db46c1b76c151202b418df21eca07bad" },
"multicursors.nvim": { "branch": "main", "commit": "8b3e14682eed06a532b155c7eae33e174846b3fd" },
"neo-tree-diagnostics.nvim": { "branch": "main", "commit": "483019d251c31acd14102bc279f938f98d9a3de6" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "f3941c57ec85d7bdb44fa53fd858fd80f159018f" },
"noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
Expand All @@ -39,17 +39,17 @@
"nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" },
"nvim-hlslens": { "branch": "main", "commit": "e4c811a401b06f86a7bb042b1d64a5cba21729a9" },
"nvim-lspconfig": { "branch": "master", "commit": "1699ce10c3aaf861cfa0c1303fcd19d2ed93e7ad" },
"nvim-lspconfig": { "branch": "master", "commit": "6b9f4bbe0aa1f351fd4845dc5fd4f3450b010f88" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-neoclip.lua": { "branch": "main", "commit": "798cd0592a81c185465db3a091a0ff8a21af60fd" },
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
"nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" },
"nvim-toggleterm.lua": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
"nvim-treesitter": { "branch": "master", "commit": "6bd108a6f10aa01b854c3c673b6d9d61662a8c93" },
"nvim-treesitter": { "branch": "master", "commit": "1398b1ba4619cef240abd496b500b95819c8c496" },
"nvim-ufo": { "branch": "main", "commit": "553d8a9c611caa9f020556d4a26b760698e5b81b" },
"nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" },
"oil-vcs-status": { "branch": "main", "commit": "f9c83ec0df05aa06c1cb1bd3b004715fd21f799b" },
"oil.nvim": { "branch": "master", "commit": "bcfe7d1ec5bbf41dd78726f579a363028d208c1a" },
"oil-vcs-status": { "branch": "main", "commit": "1861ad95734b438e7ff64eee4706c564c044c130" },
"oil.nvim": { "branch": "master", "commit": "6953c2c17d8ae7454b28c44c8767eebede312e6f" },
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
"promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" },
Expand Down
File renamed without changes.
File renamed without changes.
25 changes: 25 additions & 0 deletions lua/config/colorschemes/kanagawa.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
require('kanagawa').setup({
compile = false, -- enable compiling the colorscheme
undercurl = true, -- enable undercurls
commentStyle = { italic = true },
functionStyle = {},
keywordStyle = { italic = true},
statementStyle = { bold = true },
typeStyle = {},
transparent = false, -- do not set background color
dimInactive = false, -- dim inactive window `:h hl-NormalNC`
terminalColors = true, -- define vim.g.terminal_color_{0,17}
colors = { -- add/modify theme and palette colors
palette = {},
theme = { wave = {}, lotus = {}, dragon = {}, all = {} },
},
overrides = function(colors) -- add/modify highlights
return {}
end,
theme = "wave", -- Load "wave" theme when 'background' option is not set
background = { -- map the value of 'background' option to a theme
dark = "wave", -- try "dragon" !
light = "lotus"
},
})
vim.cmd [[colorscheme kanagawa]]
46 changes: 46 additions & 0 deletions lua/config/colorschemes/monokai_pro.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
require("monokai-pro").setup({
transparent_background = false,
terminal_colors = true,
devicons = true, -- highlight the icons of `nvim-web-devicons`
styles = {
comment = { italic = true },
keyword = { italic = true }, -- any other keyword
type = { italic = true }, -- (preferred) int, long, char, etc
storageclass = { italic = true }, -- static, register, volatile, etc
structure = { italic = true }, -- struct, union, enum, etc
parameter = { italic = true }, -- parameter pass in function
annotation = { italic = true },
tag_attribute = { italic = true }, -- attribute of tag in reactjs
},
filter = "pro", -- classic | octagon | pro | machine | ristretto | spectrum
-- Enable this will disable filter option
day_night = {
enable = false, -- turn off by default
day_filter = "pro", -- classic | octagon | pro | machine | ristretto | spectrum
night_filter = "spectrum", -- classic | octagon | pro | machine | ristretto | spectrum
},
inc_search = "background", -- underline | background
background_clear = {
"float_win",
-- "toggleterm",
"telescope",
"which-key",
"renamer",
"notify",
-- "nvim-tree",
"neo-tree",
-- "bufferline", -- better used if background of `neo-tree` or `nvim-tree` is cleared
},-- "float_win", "toggleterm", "telescope", "which-key", "renamer", "neo-tree", "nvim-tree", "bufferline"
plugins = {
bufferline = {
underline_selected = false,
underline_visible = false,
},
indent_blankline = {
context_highlight = "default", -- default | pro
context_start_underline = false,
},
},
})

vim.cmd [[colorscheme monokai-pro]]
1 change: 1 addition & 0 deletions lua/config/colorschemes/onedarkpro.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vim.cmd [[colorscheme onedark]]
2 changes: 1 addition & 1 deletion lua/config/lazy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ if not vim.loop.fs_stat(lazypath) then
"git",
"clone",
"--filter=blob:none",
"--single-branch",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
})
end
Expand Down
31 changes: 11 additions & 20 deletions lua/config/plugins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,20 @@ return {
--[[ COLORSCHEME ]]
{
"folke/tokyonight.nvim",
-- "olimorris/onedarkpro.nvim",
-- "loctvl842/monokai-pro.nvim",
-- "rebelot/kanagawa.nvim",
-- "sainnhe/gruvbox-material",
-- "projekt0n/github-nvim-theme",
lazy = false,
enabled = true,
priority = 1000,
config = function()
require('config.colorschemes.tokyonight')
end,
},
{
"sainnhe/gruvbox-material",
lazy = false,
enabled = false,
priority = 1000,
config = function()
require('config.colorschemes.gruvbox')
end,
},
{
"projekt0n/github-nvim-theme",
lazy = false,
enabled = false,
priority = 1000,
config = function()
require('config.colorschemes.github')
-- require('config.colorschemes.onedarkpro')
-- require('config.colorschemes.monokai_pro')
-- require('config.colorschemes.kanagawa')
-- require('config.colorschemes.gruvbox_material')
-- require('config.colorschemes.github_nvim_theme')
end,
},
--[[ END COLORSCHEME ]]
Expand Down Expand Up @@ -520,7 +511,7 @@ return {
},
{
"SR-Mystar/yazi.nvim",
lazy = true,
event = 'VeryLazy',
cmd = "Yazi",
opts = {
title = "",
Expand Down

0 comments on commit e735076

Please sign in to comment.