diff options
| -rw-r--r-- | lua/lvim/config/defaults.lua | 2 | ||||
| -rw-r--r-- | lua/lvim/core/alpha/dashboard.lua | 2 | ||||
| -rw-r--r-- | lua/lvim/core/lualine/components.lua | 20 | ||||
| -rw-r--r-- | lua/lvim/core/theme.lua | 6 | ||||
| -rw-r--r-- | lua/lvim/plugins.lua | 3 | ||||
| -rw-r--r-- | snapshots/default.json | 3 | ||||
| -rw-r--r-- | utils/installer/config.example.lua | 2 | ||||
| -rw-r--r-- | utils/installer/config_win.example.lua | 2 |
8 files changed, 18 insertions, 22 deletions
diff --git a/lua/lvim/config/defaults.lua b/lua/lvim/config/defaults.lua index 6a00aaa6..74a94052 100644 --- a/lua/lvim/config/defaults.lua +++ b/lua/lvim/config/defaults.lua @@ -1,7 +1,7 @@ return { leader = "space", reload_config_on_save = true, - colorscheme = "tokyonight", + colorscheme = "lunar", transparent_window = false, format_on_save = { ---@usage pattern string pattern used for the autocommand (Default: '*') diff --git a/lua/lvim/core/alpha/dashboard.lua b/lua/lvim/core/alpha/dashboard.lua index 5e73206f..e6e1fb5a 100644 --- a/lua/lvim/core/alpha/dashboard.lua +++ b/lua/lvim/core/alpha/dashboard.lua @@ -108,7 +108,7 @@ function M.get_sections() if status_ok then local function button(sc, txt, keybind, keybind_opts) local b = dashboard.button(sc, txt, keybind, keybind_opts) - b.opts.hl_shortcut = "Macro" + b.opts.hl_shortcut = "Include" return b end buttons = { diff --git a/lua/lvim/core/lualine/components.lua b/lua/lvim/core/lualine/components.lua index 455ee09a..4f3781ec 100644 --- a/lua/lvim/core/lualine/components.lua +++ b/lua/lvim/core/lualine/components.lua @@ -12,23 +12,9 @@ local function diff_source() end end -local cursorline_hl = vim.api.nvim_get_hl_by_name("CursorLine", true) - -local location_color = nil -local branch = lvim.icons.git.Branch -local separator = lvim.icons.ui.LineMiddle - -if lvim.colorscheme == "tokyonight" then - location_color = "SLBranchName" - branch = "%#SLGitIcon#" .. lvim.icons.git.Branch .. "%*" .. "%#SLBranchName#" - - local status_ok, tnc = pcall(require, "tokyonight.colors") - if status_ok then - local tncolors = tnc.setup { transform = true } - vim.api.nvim_set_hl(0, "SLSeparator", { fg = cursorline_hl.background, bg = tncolors.black }) - separator = "%#SLSeparator#" .. lvim.icons.ui.LineMiddle .. "%*" - end -end +local location_color = "SLBranchName" +local branch = "%#SLGitIcon#" .. lvim.icons.git.Branch .. "%*" .. "%#SLBranchName#" +local separator = "%#SLSeparator#" .. lvim.icons.ui.LineMiddle .. "%*" return { mode = { diff --git a/lua/lvim/core/theme.lua b/lua/lvim/core/theme.lua index 04186b0b..2b06363b 100644 --- a/lua/lvim/core/theme.lua +++ b/lua/lvim/core/theme.lua @@ -4,7 +4,11 @@ local M = {} M.config = function() lvim.builtin.theme = { - name = "tokyonight", + name = "lunar", + lunar = { + options = { -- currently unused + }, + }, tokyonight = { options = { on_highlights = function(hl, c) diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 49b6fc23..5b093846 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -17,6 +17,9 @@ local core_plugins = { { "folke/tokyonight.nvim", }, + { + "lunarvim/lunar.nvim", + }, { "Tastyep/structlog.nvim" }, { "nvim-lua/popup.nvim" }, diff --git a/snapshots/default.json b/snapshots/default.json index 27352d4e..b4db01f6 100644 --- a/snapshots/default.json +++ b/snapshots/default.json @@ -38,6 +38,9 @@ "lualine.nvim": { "commit": "3325d5d" }, + "lunar.nvim": { + "commit": "29eedf7" + }, "mason-lspconfig.nvim": { "commit": "a910b4d" }, diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua index 68b19d5c..292c3b6b 100644 --- a/utils/installer/config.example.lua +++ b/utils/installer/config.example.lua @@ -11,7 +11,7 @@ an executable -- general lvim.log.level = "warn" lvim.format_on_save = false -lvim.colorscheme = "tokyonight" +lvim.colorscheme = "lunar" -- to disable icons and use a minimalist setup, uncomment the following -- lvim.use_icons = false diff --git a/utils/installer/config_win.example.lua b/utils/installer/config_win.example.lua index ecdff296..20fe0a55 100644 --- a/utils/installer/config_win.example.lua +++ b/utils/installer/config_win.example.lua @@ -28,7 +28,7 @@ vim.g.clipboard = { -- general lvim.log.level = "warn" lvim.format_on_save = true -lvim.colorscheme = "tokyonight" +lvim.colorscheme = "lunar" -- to disable icons and use a minimalist setup, uncomment the following -- lvim.use_icons = false |