diff --git a/init.lua b/init.lua index 6c32d96..5488b6b 100644 --- a/init.lua +++ b/init.lua @@ -10,5 +10,5 @@ else -- ╰──────────────────────────────────────────────────────╯ -- vim.cmd.colorscheme("tokyodark") - vim.cmd.colorscheme("bamboo") + vim.cmd.colorscheme("rose-pine") end diff --git a/lua/pika/plugins/colorschemes.lua b/lua/pika/plugins/colorschemes.lua index 1db882b..dae1135 100644 --- a/lua/pika/plugins/colorschemes.lua +++ b/lua/pika/plugins/colorschemes.lua @@ -1,4 +1,5 @@ return { + { "SethBarberee/challenger-deep.nvim" }, -- ╭───────────────╮ -- │ common themes │ -- ╰───────────────╯ @@ -74,7 +75,88 @@ return { -- ╭───────────╮ -- │ rose-pine │ -- ╰───────────╯ - { "rose-pine/neovim", name = "rose-pine" }, + { + "rose-pine/neovim", + name = "rose-pine", + opts = { + variant = "moon", -- auto, main, moon, or dawn + dark_variant = "moon", -- main, moon, or dawn + dim_inactive_windows = false, + extend_background_behind_borders = true, + + enable = { + terminal = true, + legacy_highlights = true, -- Improve compatibility for previous versions of Neovim + migrations = true, -- Handle deprecated options automatically + }, + + styles = { + bold = true, + italic = true, + transparency = false, + }, + + groups = { + border = "muted", + link = "iris", + panel = "surface", + + error = "love", + hint = "iris", + info = "foam", + note = "pine", + todo = "rose", + warn = "gold", + + git_add = "foam", + git_change = "rose", + git_delete = "love", + git_dirty = "rose", + git_ignore = "muted", + git_merge = "iris", + git_rename = "pine", + git_stage = "iris", + git_text = "rose", + git_untracked = "subtle", + + h1 = "iris", + h2 = "foam", + h3 = "rose", + h4 = "gold", + h5 = "pine", + h6 = "foam", + }, + + palette = { + -- Override the builtin palette per variant + -- moon = { + -- base = '#18191a', + -- overlay = '#363738', + -- }, + }, + + -- NOTE: Highlight groups are extended (merged) by default. Disable this + -- per group via `inherit = false` + highlight_groups = { + -- INFO: + -- leafy search + CurSearch = { fg = "base", bg = "leaf", inherit = false }, + Search = { fg = "text", bg = "leaf", blend = 20, inherit = false }, + }, + + before_highlight = function(group, highlight, palette) + -- Disable all undercurls + -- if highlight.undercurl then + -- highlight.undercurl = false + -- end + -- + -- Change palette colour + -- if highlight.fg == palette.pine then + -- highlight.fg = palette.foam + -- end + end, + }, + }, -- ╭───────────────────────────╮ -- │ nordic (monet is similar) │ diff --git a/lua/pika/plugins/init.lua b/lua/pika/plugins/init.lua index 32f48f9..410d938 100644 --- a/lua/pika/plugins/init.lua +++ b/lua/pika/plugins/init.lua @@ -35,4 +35,6 @@ return { require("tiny-devicons-auto-colors").setup() end, }, + + { "someguy0555/snake.nvim" }, } diff --git a/lua/pika/plugins/ui.lua b/lua/pika/plugins/ui.lua index 36baed2..bbc5d2e 100644 --- a/lua/pika/plugins/ui.lua +++ b/lua/pika/plugins/ui.lua @@ -223,129 +223,119 @@ return { -- ╭────────────────────────────────╮ -- │ lualine - another bar for nvim │ -- ╰────────────────────────────────╯ - { - "nvim-lualine/lualine.nvim", - opts = { - options = { - theme = bubbles_theme, - component_separators = "", - section_separators = { left = "", right = "" }, - }, - sections = { - lualine_a = { { "mode", separator = { left = "" }, right_padding = 4 } }, - lualine_b = { "filename", "branch" }, - lualine_c = { - "%=", - "cwd", - }, - lualine_x = {}, - lualine_y = { "filetype", "progress" }, - lualine_z = { - { "location", separator = { right = "" }, left_padding = 4 }, - }, - }, - inactive_sections = { - lualine_a = { "filename" }, - lualine_b = {}, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = { "location" }, - }, - tabline = {}, - extensions = {}, - }, - }, - + -- { + -- "nvim-lualine/lualine.nvim", + -- opts = { + -- options = { + -- theme = bubbles_theme, + -- component_separators = "", + -- section_separators = { left = "", right = "" }, + -- }, + -- sections = { + -- lualine_a = { { "mode", separator = { left = "" }, right_padding = 4 } }, + -- lualine_b = { "filename", "branch" }, + -- lualine_c = { + -- "%=", + -- "cwd", + -- }, + -- lualine_x = {}, + -- lualine_y = { "filetype", "progress" }, + -- lualine_z = { + -- { "location", separator = { right = "" }, left_padding = 4 }, + -- }, + -- }, + -- inactive_sections = { + -- lualine_a = { "filename" }, + -- lualine_b = {}, + -- lualine_c = {}, + -- lualine_x = {}, + -- lualine_y = {}, + -- lualine_z = { "location" }, + -- }, + -- tabline = {}, + -- extensions = {}, + -- }, + -- }, -- ╭──────────────────────────────╮ -- │ slimline - nice bar for nvim │ -- ╰──────────────────────────────╯ - -- { - -- "sschleemilch/slimline.nvim", - -- opts = { - -- bold = true, -- makes primary parts and mode bold - -- verbose_mode = false, -- Mode as single letter or as a word - -- style = "bg", -- or "fg". Whether highlights should be applied to bg or fg of components - -- mode_follow_style = true, -- Whether the mode color components should follow the style option - -- spaces = { - -- components = "─", - -- left = "─", - -- right = "─", - -- }, - -- configs = { - -- path = { - -- hl = { - -- primary = "Define", - -- }, - -- }, - -- git = { - -- hl = { - -- primary = "Function", - -- }, - -- }, - -- diagnostics = { - -- hl = { - -- primary = "Statement", - -- }, - -- }, - -- filetype_lsp = { - -- hl = { - -- primary = "String", - -- }, - -- }, - -- }, - -- components = { -- Choose components and their location - -- left = { - -- "mode", - -- "progress", - -- -- "path", - -- -- "git", - -- }, - -- center = { - -- "path", - -- "git", - -- }, - -- right = { - -- "diagnostics", - -- "filetype_lsp", - -- "progress", - -- }, - -- }, - -- sep = { - -- hide = { - -- first = false, -- hides the first separator - -- last = false, -- hides the last separator - -- }, - -- left = "", -- left separator of components - -- right = "", -- right separator of components - -- }, - -- hl = { - -- modes = { - -- normal = "Type", -- highlight base of modes - -- insert = "Function", - -- pending = "Boolean", - -- visual = "Keyword", - -- command = "String", - -- }, - -- base = "Comment", -- highlight of everything in in between components - -- primary = "Normal", -- highlight of primary parts (e.g. filename) - -- secondary = "Comment", -- highlight of secondary parts (e.g. filepath) - -- }, - -- icons = { - -- diagnostics = { - -- ERROR = " ", - -- WARN = " ", - -- HINT = " ", - -- INFO = " ", - -- }, - -- git = { - -- branch = "", - -- }, - -- folder = " ", - -- lines = " ", - -- }, - -- }, - -- }, + { + "sschleemilch/slimline.nvim", + -- INFO: pure + -- + -- opts = { + -- style = "fg", + -- bold = true, + -- hl = { + -- secondary = "Comment", + -- }, + -- configs = { + -- mode = { + -- hl = { + -- normal = "Comment", + -- insert = "Normal", + -- pending = "Normal", + -- visual = "Normal", + -- command = "Normal", + -- }, + -- }, + -- path = { + -- hl = { + -- primary = "Label", + -- }, + -- }, + -- git = { + -- hl = { + -- primary = "Function", + -- }, + -- }, + -- filetype_lsp = { + -- hl = { + -- primary = "String", + -- }, + -- }, + -- }, + -- }, + -- INFO: rainbow + -- + opts = { + style = "bg", + configs = { + path = { + hl = { + primary = "Define", + }, + }, + git = { + hl = { + primary = "Function", + }, + }, + filetype_lsp = { + hl = { + primary = "String", + }, + }, + }, + }, + -- INFO: slashes + -- + -- opts = { + -- spaces = { + -- components = "", + -- left = "", + -- right = "", + -- }, + -- sep = { + -- hide = { + -- first = true, + -- last = true, + -- }, + -- left = "", + -- right = "", + -- }, + -- }, + }, -- ╭────────────────────────────────────────╮ -- │ which key - to know what to press next │