From cbf8ed3cc7edc75dbb55fe1abe3b378e6fe74a9f Mon Sep 17 00:00:00 2001 From: Taken Date: Tue, 22 Aug 2023 15:06:00 +0200 Subject: [PATCH] Modified config --- lua/taken/core/opts.lua | 11 ----------- lua/taken/init.lua | 4 ++-- lua/taken/lazy/init.lua | 2 ++ lua/taken/{ => lazy}/lazy.lua | 0 lua/taken/{ => lazy}/pluginloader.lua | 0 lua/taken/plugins/bufferline.lua | 7 +++++++ lua/taken/prefs.lua.example | 8 ++++---- 7 files changed, 15 insertions(+), 17 deletions(-) create mode 100644 lua/taken/lazy/init.lua rename lua/taken/{ => lazy}/lazy.lua (100%) rename lua/taken/{ => lazy}/pluginloader.lua (100%) diff --git a/lua/taken/core/opts.lua b/lua/taken/core/opts.lua index 2057026..fabf4d5 100644 --- a/lua/taken/core/opts.lua +++ b/lua/taken/core/opts.lua @@ -3,17 +3,6 @@ local o = vim.o local opt = vim.opt local cmd = vim.cmd -local status, prefs = pcall(require, "taken.prefs") -if not status then - prefs = {} -end - -if prefs.colorscheme == nil then - cmd("colorscheme default") -else - cmd("colorscheme " .. prefs.colorscheme) -end - local cursorcolumncolor = vim.fn.synIDattr(vim.fn.hlID("CursorColumn"), "bg") cmd("hi CursorLine guibg=" .. cursorcolumncolor) diff --git a/lua/taken/init.lua b/lua/taken/init.lua index bf3fe5f..8c4f9e3 100644 --- a/lua/taken/init.lua +++ b/lua/taken/init.lua @@ -1,5 +1,5 @@ require("taken.lazy") require("taken.core") -require("taken.pluginloader") +require("taken.prefs") --- vim.notify = require("notify") +vim.notify = require("notify") diff --git a/lua/taken/lazy/init.lua b/lua/taken/lazy/init.lua new file mode 100644 index 0000000..1b5fdf6 --- /dev/null +++ b/lua/taken/lazy/init.lua @@ -0,0 +1,2 @@ +require("taken.lazy.lazy") +require("taken.lazy.pluginloader") diff --git a/lua/taken/lazy.lua b/lua/taken/lazy/lazy.lua similarity index 100% rename from lua/taken/lazy.lua rename to lua/taken/lazy/lazy.lua diff --git a/lua/taken/pluginloader.lua b/lua/taken/lazy/pluginloader.lua similarity index 100% rename from lua/taken/pluginloader.lua rename to lua/taken/lazy/pluginloader.lua diff --git a/lua/taken/plugins/bufferline.lua b/lua/taken/plugins/bufferline.lua index a003315..0d74eeb 100644 --- a/lua/taken/plugins/bufferline.lua +++ b/lua/taken/plugins/bufferline.lua @@ -60,3 +60,10 @@ bufferline.setup { }, } } + +vim.g.transparent_groups = vim.list_extend( + vim.g.transparent_groups or {}, + vim.tbl_map(function(v) + return v.hl_group + end, vim.tbl_values(require('bufferline.config').highlights)) +) diff --git a/lua/taken/prefs.lua.example b/lua/taken/prefs.lua.example index 73518e3..bdddf32 100644 --- a/lua/taken/prefs.lua.example +++ b/lua/taken/prefs.lua.example @@ -1,5 +1,5 @@ -local M = {} +local M = { + colorscheme = "catppuccin-mocha" +} -M.colorscheme = "onedark_vivid" - -return M +vim.cmd("colorscheme " .. M.colorscheme)