diff --git a/init.lua b/init.lua index 2aedc38..6ca34f3 100644 --- a/init.lua +++ b/init.lua @@ -29,7 +29,7 @@ require("lazy").setup({ -- 🎨 COLORSCHEME { "nvim-lualine/lualine.nvim" }, - { "projekt0n/github-nvim-theme", priority = 1000 }, + { "rebelot/kanagawa.nvim" }, -- 💡 LSP + AUTOCOMPLETE { "neovim/nvim-lspconfig" }, diff --git a/lazy-lock.json b/lazy-lock.json index 654ce59..e789412 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,8 +11,8 @@ "copilot.lua": { "branch": "master", "commit": "92e08cd472653beaece28ad9c8508a851a613358" }, "copilot.vim": { "branch": "release", "commit": "da369d90cfd6c396b1d0ec259836a1c7222fb2ea" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" }, + "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" }, diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 37b0e4a..476d47d 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,14 +1,30 @@ -- lua/plugins/colorscheme.lua - - -require('github-theme').setup({ +-- Default options: +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 + background = { -- map the value of 'background' option to a theme + dark = "wave", -- try "dragon" ! + light = "lotus" + }, }) -vim.cmd("colorscheme github_dark_default") - --- Optional: set contrast, italic comments, etc -vim.g.gruvbox_contrast_dark = "hard" -- options: "soft", "medium", "hard" -vim.g.gruvbox_invert_selection = "0" -vim.g.gruvbox_italic = 1 -vim.g.gruvbox_bold = 1 +-- setup must be called before loading +vim.cmd("colorscheme kanagawa-dragon")