Skip to content

Commit

Permalink
misc(color): New colorscheme, config tweaks.
Browse files Browse the repository at this point in the history
* Added config for `space_vim_dark`.
* Changed and tweaked `tokyonight` file.
* `init` annotations.
* Annotation fixes and additions.
  • Loading branch information
DrKJeff16 committed Jun 1, 2024
1 parent e121a37 commit 9eeca0c
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 9 deletions.
6 changes: 3 additions & 3 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,12 @@ if is_tbl(Pkg.colorschemes) and not empty(Pkg.colorschemes) then
v = {},
}

---@type ('nightfox'|'tokyonight'|'catppuccin'|'onedark'|'spaceduck'|'spacemacs'|'molokai'|'dracula'|'oak')[]
--- Reorder to your liking.
---@type ('nightfox'|'tokyonight'|'catppuccin'|'onedark'|'spaceduck'|'spacemacs'|'molokai'|'dracula'|'oak'|'space_vim_dark')[]
local selected = {
-- Reorder to your liking.
'tokyonight',
'catppuccin',
'nightfox',
'tokyonight',
'onedark',
'spacemacs',
'molokai',
Expand Down
1 change: 1 addition & 0 deletions lua/lazy_cfg/colorschemes/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ local submods = {
'spaceduck',
'dracula',
'spacemacs',
'space_vim_dark',
}

local M = src(submods)
Expand Down
19 changes: 19 additions & 0 deletions lua/lazy_cfg/colorschemes/space_vim_dark.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---@diagnostic disable:unused-local
---@diagnostic disable:unused-function

local User = require('user')
local csc_t = User.types.colorschemes

---@type CscSubMod
local M = {
mod_cmd = 'colorscheme space-vim-dark',
mod_pfx = 'lazy_cfg.colorschemes.space_vim_dark',
}

if vim.g.installed_space_vim_dark then
function M.setup()
vim.cmd(M.mod_cmd)
end
end

return M
11 changes: 6 additions & 5 deletions lua/lazy_cfg/colorschemes/tokyonight.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if exists('tokyonight') then
local TN = require('tokyonight')

---@type Config
local opts = {
local Opts = {
on_colors = function(colors)
colors.error = '#df4f4f'
end,
Expand Down Expand Up @@ -57,20 +57,21 @@ if exists('tokyonight') then
'qf',
'help',
'lazy',
'checkhealth',
'terminal',
'toggleterm',
'packer',
'TelescopePrompt',
'vista_kind',
'NvimTree',
},

style = 'night',
style = 'moon',
live_reload = true,
use_background = true,
hide_inactive_statusline = false,
lualine_bold = true,
styles = {
comments = { italic = false },
comments = { italic = true },
keywords = { italic = false, bold = true },
functions = { bold = true, italic = false },
variables = {},
Expand All @@ -79,7 +80,7 @@ if exists('tokyonight') then
},
}

TN.setup(opts)
TN.setup(Opts)

vim.cmd(M.mod_cmd)
end
Expand Down
6 changes: 5 additions & 1 deletion lua/lazy_cfg/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -156,27 +156,31 @@ M.COLORSCHEMES = {
'navarasu/onedark.nvim',
priority = 1000,
name = 'OneDark',
main = 'onedark',
version = false,
init = colorscheme_init('installed_onedark'),
},
{
'catppuccin/nvim',
priority = 1000,
name = 'catppuccin',
main = 'catppuccin',
version = false,
init = colorscheme_init('installed_catppuccin'),
},
{
'folke/tokyonight.nvim',
priority = 1000,
name = 'tokyonight',
main = 'tokyonight',
version = false,
init = colorscheme_init('installed_tokyonight'),
},
{
'EdenEast/nightfox.nvim',
priority = 1000,
name = 'nightfox',
main = 'nightfox',
version = false,
init = colorscheme_init('installed_nightfox'),
},
Expand All @@ -199,7 +203,7 @@ M.COLORSCHEMES = {
},
{
'tjdevries/colorbuddy.vim',
lazy = true,
lazy = false,
priority = 1000,
name = 'colorbuddy',
version = false,
Expand Down
1 change: 1 addition & 0 deletions lua/user/types/colorschemes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
---@field nightfox? CscSubMod|nil
---@field spaceduck? CscSubMod|nil
---@field dracula? CscSubMod|nil
---@field space_vim_dark? CscSubMod|nil
---@field spacemacs? CscSubMod|nil
---@field molokai? CscSubMod|nil
---@field gloombuddy? CscSubMod|nil
Expand Down

0 comments on commit 9eeca0c

Please sign in to comment.