Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/stylua.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: stylua
on: [pull_request]
jobs:
stylua:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: JohnnyMorganz/stylua-action@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
version: latest
args: --check .
3 changes: 3 additions & 0 deletions .stylua.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
indent_type = "Spaces"
indent_width = 2
call_parentheses = "NoSingleTable"
4 changes: 2 additions & 2 deletions colors/bluloco.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ local bluloco = require("bluloco")
local config = bluloco.config
local load = bluloco.load

if (config.style == "dark") then
if config.style == "dark" then
vim.o.background = "dark"
elseif (config.style == "light") then
elseif config.style == "light" then
vim.o.background = "light"
end

Expand Down
34 changes: 16 additions & 18 deletions lua/bluloco/init.lua
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
---@diagnostic disable: undefined-global
local lush = require('lush')
local lush = require("lush")
local M = {}


local isGui = vim.fn.has("gui_running") == 1

local defaultConfig = {
style = "auto", -- auto | light | dark
transparent = false,
italics = false,
terminal = isGui,
guicursor = true,
style = "auto", -- auto | light | dark
transparent = false,
italics = false,
terminal = isGui,
guicursor = true,
rainbow_headings = false,
float_window = "default" -- default | transparent
float_window = "default", -- default | transparent
}

M.config = defaultConfig
Expand All @@ -21,18 +20,18 @@ function M.setup(options)
M.config = vim.tbl_deep_extend("force", {}, defaultConfig, options or {})

-- Set cursor color
if (M.config.guicursor) then
if M.config.guicursor then
vim.opt.guicursor = "n-v-c-sm:block-Cursor,i-ci-ve:ver25-Cursor,r-cr-o:hor20-Cursor"
end
end

function M.load()
local theme = require('lush_theme.bluloco')
vim.g.colors_name = 'bluloco'
package.loaded['lush_theme.bluloco'] = nil
local theme = require("lush_theme.bluloco")
vim.g.colors_name = "bluloco"
package.loaded["lush_theme.bluloco"] = nil

-- transparent
if (M.config.transparent == true and not isGui) then
if M.config.transparent == true and not isGui then
theme = lush.extends({ theme }).with(function()
return {
Normal { theme.Normal, bg = "NONE" }, -- normal text
Expand All @@ -42,13 +41,13 @@ function M.load()
NvimTreeNormal { bg = "NONE" },
NvimTreeNormalNC { bg = "NONE" },
BufferInactive { theme.BufferInactive, bg = "NONE" },
BufferVisible { theme.BufferCurrent }
BufferVisible { theme.BufferCurrent },
}
end)
end

-- italics
if (M.config.italics == true) then
if M.config.italics == true then
theme = lush.extends({ theme }).with(function(injected_functions)
local sym = injected_functions.sym
return {
Expand All @@ -62,16 +61,15 @@ function M.load()
end

-- bufferline
local bufferlineInstalled = pcall(require, 'bufferline')
if (bufferlineInstalled) then
local bufferlineInstalled = pcall(require, "bufferline")
if bufferlineInstalled then
theme = lush.extends({ theme }).with(function()
return {
TabLineSel { bg = theme.Statement.fg }, -- tab pages line, active tab page label
}
end)
end


lush(theme)
end

Expand Down
118 changes: 59 additions & 59 deletions lua/lualine/themes/bluloco.lua
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
local dark = {
bg = "#282C34",
fg = "#8691A3",
normalFG = "#abb2bf",
green = "#3FC56B",
red = "#FF6480",
purple = "#9F7EFE",
blue = "#10B1FE",
blueDark = "#3691FF",
grey3 = "#2d333e",
grey5 = "#333a48",
grey7 = "#384252",
grey10 = "#3c495d",
grey15 = "#425067",
grey20 = "#4a5a73",
bg = "#282C34",
fg = "#8691A3",
normalFG = "#abb2bf",
green = "#3FC56B",
red = "#FF6480",
purple = "#9F7EFE",
blue = "#10B1FE",
blueDark = "#3691FF",
grey3 = "#2d333e",
grey5 = "#333a48",
grey7 = "#384252",
grey10 = "#3c495d",
grey15 = "#425067",
grey20 = "#4a5a73",
}

local light = {
bg = "#F9F9F9",
fg = "#6D7281",
normalFG = "#383A42",
green = "#23974A",
red = "#D52753",
purple = "#823FF1",
blue = "#0098DD",
blueDark = "#275FE4",
grey3 = "#ededee",
grey5 = "#e7e8e9",
grey7 = "#dee1e3",
grey10 = "#d2d8da",
grey15 = "#c4cbcf",
grey20 = "#b9c2c6",
bg = "#F9F9F9",
fg = "#6D7281",
normalFG = "#383A42",
green = "#23974A",
red = "#D52753",
purple = "#823FF1",
blue = "#0098DD",
blueDark = "#275FE4",
grey3 = "#ededee",
grey5 = "#e7e8e9",
grey7 = "#dee1e3",
grey10 = "#d2d8da",
grey15 = "#c4cbcf",
grey20 = "#b9c2c6",
}

local t = dark

if vim.o.background == "light" then
t = light
t = light
end

return {
normal = {
a = { bg = t.blue, fg = t.bg },
b = { bg = t.grey7, fg = t.fg },
c = { bg = t.grey3, fg = t.fg },
},
insert = {
a = { bg = t.blueDark, fg = t.bg },
b = { bg = t.grey7, fg = t.fg },
c = { bg = t.grey3, fg = t.fg },
},
visual = {
a = { bg = t.purple, fg = t.bg },
b = { bg = t.grey7, fg = t.fg },
c = { bg = t.grey3, fg = t.fg },
},
replace = {
a = { bg = t.red, fg = t.bg },
b = { bg = t.grey7, fg = t.fg },
c = { bg = t.grey3, fg = t.fg },
},
command = {
a = { bg = t.green, fg = t.bg },
b = { bg = t.grey7, fg = t.fg },
c = { bg = t.grey3, fg = t.fg },
},
inactive = {
a = { bg = t.grey20, fg = t.bg },
b = { bg = t.grey10, fg = t.bg },
c = { bg = t.grey3, fg = t.grey20 },
},
normal = {
a = { bg = t.blue, fg = t.bg },
b = { bg = t.grey7, fg = t.fg },
c = { bg = t.grey3, fg = t.fg },
},
insert = {
a = { bg = t.blueDark, fg = t.bg },
b = { bg = t.grey7, fg = t.fg },
c = { bg = t.grey3, fg = t.fg },
},
visual = {
a = { bg = t.purple, fg = t.bg },
b = { bg = t.grey7, fg = t.fg },
c = { bg = t.grey3, fg = t.fg },
},
replace = {
a = { bg = t.red, fg = t.bg },
b = { bg = t.grey7, fg = t.fg },
c = { bg = t.grey3, fg = t.fg },
},
command = {
a = { bg = t.green, fg = t.bg },
b = { bg = t.grey7, fg = t.fg },
c = { bg = t.grey3, fg = t.fg },
},
inactive = {
a = { bg = t.grey20, fg = t.bg },
b = { bg = t.grey10, fg = t.bg },
c = { bg = t.grey3, fg = t.grey20 },
},
}
Loading
Loading