chore: Added theme change script to raycast and fix a bunch of theme related stuff
This commit is contained in:
parent
52c8d9ccd9
commit
a7a9cd1848
27 changed files with 442 additions and 490 deletions
|
@ -1,39 +1,4 @@
|
|||
-- Themery block
|
||||
-- This block will be replaced by Themery.
|
||||
require("catppuccin").setup({
|
||||
flavour = "latte", -- latte, frappe, macchiato, mocha
|
||||
styles = {
|
||||
comments = { "italic" },
|
||||
conditionals = { "italic" },
|
||||
},
|
||||
integrations = {
|
||||
cmp = true,
|
||||
treesitter = true,
|
||||
treesitter_context = true,
|
||||
fidget = true,
|
||||
telescope = true,
|
||||
leap = true,
|
||||
mason = true,
|
||||
native_lsp = {
|
||||
enabled = true,
|
||||
virtual_text = {
|
||||
errors = { "italic" },
|
||||
hints = { "italic" },
|
||||
warnings = { "italic" },
|
||||
information = { "italic" },
|
||||
},
|
||||
underlines = {
|
||||
errors = { "underline" },
|
||||
hints = { "underline" },
|
||||
warnings = { "underline" },
|
||||
information = { "underline" },
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
vim.opt.background = "light"
|
||||
|
||||
|
||||
vim.cmd("colorscheme catppuccin-latte")
|
||||
vim.g.theme_id = 4
|
||||
-- end themery block
|
||||
vim.g.gruvbox_material_better_performance = 1
|
||||
vim.g.gruvbox_material_background = 'medium'
|
||||
vim.opt.background = 'dark'
|
||||
vim.cmd('colorscheme gruvbox-material')
|
||||
|
|
|
@ -27,6 +27,9 @@ vim.opt.expandtab = true
|
|||
--quickfix keybinds
|
||||
vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
|
||||
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
|
||||
--buffer keybinds
|
||||
vim.keymap.set("n", "<A-h>", "<cmd>bp<CR>")
|
||||
vim.keymap.set("n", "<A-l>", "<cmd>bn<CR>")
|
||||
--Undo dir
|
||||
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
|
||||
vim.opt.undofile = true
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
{"terminal": "tmux"}
|
|
@ -71,6 +71,5 @@ require("bufferline").setup({
|
|||
return true
|
||||
end
|
||||
end,
|
||||
},
|
||||
highlights = require("catppuccin.groups.integrations.bufferline").get()
|
||||
}
|
||||
})
|
||||
|
|
|
@ -5,22 +5,28 @@ lazy.setup({
|
|||
'lewis6991/impatient.nvim',
|
||||
|
||||
-------------------------------------------THEMES------------------------------------------
|
||||
{
|
||||
'zaldih/themery.nvim',
|
||||
config = function()
|
||||
require('plugins.themery')
|
||||
end
|
||||
},
|
||||
{
|
||||
'catppuccin/nvim',
|
||||
name = "catppuccin",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
config = function()
|
||||
require("catppuccin").setup({
|
||||
integrations = {
|
||||
cmp = true,
|
||||
treesitter = true,
|
||||
treesitter_context = true,
|
||||
fidget = true,
|
||||
telescope = true,
|
||||
leap = true,
|
||||
mason = true,
|
||||
},
|
||||
})
|
||||
end
|
||||
},
|
||||
|
||||
{ "ellisonleao/gruvbox.nvim", priority = 1000 },
|
||||
'sainnhe/gruvbox-material',
|
||||
|
||||
'rose-pine/neovim',
|
||||
-------------------------------------------------------MFP---------------------------------
|
||||
{
|
||||
'susliko/tla.nvim',
|
||||
|
@ -53,7 +59,8 @@ lazy.setup({
|
|||
'luk400/vim-jukit',
|
||||
config = function()
|
||||
require 'plugins.jukit'
|
||||
end
|
||||
end,
|
||||
ft = { 'python', 'json' }
|
||||
},
|
||||
--org mode
|
||||
{
|
||||
|
@ -68,8 +75,8 @@ lazy.setup({
|
|||
|
||||
-- Setup orgmode
|
||||
require('orgmode').setup({
|
||||
org_agenda_files = '~/orgfiles/**/*',
|
||||
org_default_notes_file = '~/orgfiles/refile.org',
|
||||
org_agenda_files = '~/org/**/*',
|
||||
org_default_notes_file = '~/org/refile.org',
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
@ -363,14 +370,14 @@ lazy.setup({
|
|||
"runoshun/vim-alloy",
|
||||
|
||||
--Tabs
|
||||
{
|
||||
'akinsho/bufferline.nvim',
|
||||
version = 'v3.*',
|
||||
dependencies = 'nvim-tree/nvim-web-devicons',
|
||||
config = function()
|
||||
require("plugins.bufferline")
|
||||
end
|
||||
},
|
||||
--{
|
||||
-- 'akinsho/bufferline.nvim',
|
||||
-- version = 'v3.*',
|
||||
-- dependencies = 'nvim-tree/nvim-web-devicons',
|
||||
-- config = function()
|
||||
-- require("plugins.bufferline")
|
||||
-- end
|
||||
--},
|
||||
|
||||
--does so much
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require('lualine').setup {
|
||||
options = {
|
||||
icons_enabled = true,
|
||||
theme = 'catppuccin',
|
||||
theme = 'auto',
|
||||
component_separators = { left = '', right = ''},
|
||||
section_separators = { left = '', right = ''},
|
||||
disabled_filetypes = {
|
||||
|
|
|
@ -1,125 +0,0 @@
|
|||
require("themery").setup({
|
||||
themes = { {
|
||||
name = "Gruvbox dark",
|
||||
colorscheme = "gruvbox",
|
||||
before = [[
|
||||
vim.opt.background = "dark"
|
||||
]],
|
||||
},
|
||||
{
|
||||
name = "Gruvbox light",
|
||||
colorscheme = "gruvbox",
|
||||
before = [[
|
||||
vim.opt.background = "light"
|
||||
]]
|
||||
},
|
||||
{
|
||||
name = "Catppuccin Frappe",
|
||||
colorscheme = "catppuccin-frappe",
|
||||
before = [[
|
||||
require("catppuccin").setup({
|
||||
flavour = "frappe", -- latte, frappe, macchiato, mocha
|
||||
styles = {
|
||||
comments = { "italic" },
|
||||
conditionals = { "italic" },
|
||||
},
|
||||
integrations = {
|
||||
cmp = true,
|
||||
treesitter = true,
|
||||
treesitter_context = true,
|
||||
fidget = true,
|
||||
telescope = true,
|
||||
leap = true,
|
||||
mason = true,
|
||||
native_lsp = {
|
||||
enabled = true,
|
||||
virtual_text = {
|
||||
errors = { "italic" },
|
||||
hints = { "italic" },
|
||||
warnings = { "italic" },
|
||||
information = { "italic" },
|
||||
},
|
||||
underlines = {
|
||||
errors = { "underline" },
|
||||
hints = { "underline" },
|
||||
warnings = { "underline" },
|
||||
information = { "underline" },
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
vim.opt.background = "dark"
|
||||
]]
|
||||
},
|
||||
{
|
||||
name = "Catppuccin Latte",
|
||||
colorscheme = "catppuccin-latte",
|
||||
before = [[
|
||||
require("catppuccin").setup({
|
||||
flavour = "latte", -- latte, frappe, macchiato, mocha
|
||||
styles = {
|
||||
comments = { "italic" },
|
||||
conditionals = { "italic" },
|
||||
},
|
||||
integrations = {
|
||||
cmp = true,
|
||||
treesitter = true,
|
||||
treesitter_context = true,
|
||||
fidget = true,
|
||||
telescope = true,
|
||||
leap = true,
|
||||
mason = true,
|
||||
native_lsp = {
|
||||
enabled = true,
|
||||
virtual_text = {
|
||||
errors = { "italic" },
|
||||
hints = { "italic" },
|
||||
warnings = { "italic" },
|
||||
information = { "italic" },
|
||||
},
|
||||
underlines = {
|
||||
errors = { "underline" },
|
||||
hints = { "underline" },
|
||||
warnings = { "underline" },
|
||||
information = { "underline" },
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
vim.opt.background = "light"
|
||||
]]
|
||||
},
|
||||
{
|
||||
name = "Rosé Pine",
|
||||
colorscheme = "rose-pine",
|
||||
before = [[
|
||||
require('rose-pine').setup({
|
||||
variant = "main"
|
||||
})
|
||||
vim.opt.background = "dark"
|
||||
]]
|
||||
},
|
||||
{
|
||||
name = "Rosé Pine Moon",
|
||||
colorscheme = "rose-pine",
|
||||
before = [[
|
||||
require('rose-pine').setup({
|
||||
variant = "moon"
|
||||
})
|
||||
vim.opt.background = "dark"
|
||||
]]
|
||||
},
|
||||
{
|
||||
name = "Rosé Pine Dawn",
|
||||
colorscheme = "rose-pine",
|
||||
before = [[
|
||||
require('rose-pine').setup({
|
||||
variant = "dawn"
|
||||
})
|
||||
vim.opt.background = "light"
|
||||
]]
|
||||
},
|
||||
},
|
||||
themeConfigFile = "~/.config/nvim/lua/core/theme.lua", -- Described below
|
||||
livePreview = true, -- Apply theme while browsing. Default to true.
|
||||
})
|
|
@ -41,6 +41,21 @@ function M.render()
|
|||
-- Remove leading slash.
|
||||
path = path:gsub('^/', '')
|
||||
|
||||
-- Get the background color of the Normal highlight group
|
||||
local normal_bg_color = vim.api.nvim_get_hl_by_name('Normal', true).background
|
||||
-- Get the foreground color of the Normal highlight group
|
||||
local normal_fg_color = vim.api.nvim_get_hl_by_name('Normal', true).foreground
|
||||
|
||||
-- Convert the RGB color to a hex string
|
||||
local bg_hex_color = string.format('#%06x', normal_bg_color)
|
||||
-- Convert the RGB color to a hex string
|
||||
local fg_hex_color = string.format('#%06x', normal_fg_color)
|
||||
|
||||
-- Define the Winbar highlight group with the same background color
|
||||
vim.api.nvim_command('highlight Winbar guibg=' .. bg_hex_color)
|
||||
-- Define the Winbar highlight group with the same foreground color
|
||||
vim.api.nvim_command('highlight Winbar guifg=' .. fg_hex_color)
|
||||
|
||||
return table.concat {
|
||||
' ',
|
||||
prefix,
|
||||
|
@ -58,10 +73,10 @@ vim.api.nvim_create_autocmd('BufWinEnter', {
|
|||
desc = 'Attach winbar',
|
||||
callback = function(args)
|
||||
if
|
||||
not vim.api.nvim_win_get_config(0).zindex -- Not a floating window
|
||||
and vim.bo[args.buf].buftype == '' -- Normal buffer
|
||||
not vim.api.nvim_win_get_config(0).zindex -- Not a floating window
|
||||
and vim.bo[args.buf].buftype == '' -- Normal buffer
|
||||
and vim.api.nvim_buf_get_name(args.buf) ~= '' -- Has a file name
|
||||
and not vim.wo[0].diff -- Not in diff mode
|
||||
and not vim.wo[0].diff -- Not in diff mode
|
||||
then
|
||||
vim.wo.winbar = "%{%v:lua.require'winbar'.render()%}"
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue