Import omarcy-mars-theme and local files, reformat & rename other files
This commit is contained in:
@@ -20,7 +20,7 @@ macos_custom_beam_cursor yes
|
||||
# theme stuff
|
||||
# NOTE: on linux, may want background_opacity at 1.0 and let hyprland handle transparency
|
||||
include ~/.config/kitty/theme.conf
|
||||
background_opacity 0.95
|
||||
background_opacity 0.94
|
||||
|
||||
# etc
|
||||
enable_audio_bell no
|
||||
|
||||
@@ -8,7 +8,7 @@ return {
|
||||
settings = {
|
||||
save_on_toggle = true,
|
||||
sync_on_ui_close = true,
|
||||
}
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
@@ -1,123 +1,130 @@
|
||||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
"stevearc/conform.nvim",
|
||||
"williamboman/mason.nvim",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
"hrsh7th/cmp-buffer",
|
||||
"hrsh7th/cmp-path",
|
||||
"hrsh7th/cmp-cmdline",
|
||||
"hrsh7th/nvim-cmp",
|
||||
"L3MON4D3/LuaSnip", -- snippets, using luasnip for now
|
||||
"saadparwaiz1/cmp_luasnip", -- snippets, using luasnip for now
|
||||
{
|
||||
"L3MON4D3/LuaSnip",
|
||||
version = "v2.*",
|
||||
-- build = "make install_jsregexp"
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
"stevearc/conform.nvim",
|
||||
"williamboman/mason.nvim",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
"hrsh7th/cmp-buffer",
|
||||
"hrsh7th/cmp-path",
|
||||
"hrsh7th/cmp-cmdline",
|
||||
"hrsh7th/nvim-cmp",
|
||||
"L3MON4D3/LuaSnip", -- snippets, using luasnip for now
|
||||
"saadparwaiz1/cmp_luasnip", -- snippets, using luasnip for now
|
||||
},
|
||||
|
||||
config = function()
|
||||
require("conform").setup({ formatters_by_ft = {} })
|
||||
local cmp = require('cmp')
|
||||
local cmp_lsp = require("cmp_nvim_lsp")
|
||||
local capabilities = vim.tbl_deep_extend(
|
||||
"force",
|
||||
{},
|
||||
vim.lsp.protocol.make_client_capabilities(),
|
||||
cmp_lsp.default_capabilities()
|
||||
)
|
||||
config = function()
|
||||
require("conform").setup({ formatters_by_ft = {} })
|
||||
local cmp = require('cmp')
|
||||
local cmp_lsp = require("cmp_nvim_lsp")
|
||||
local capabilities = vim.tbl_deep_extend(
|
||||
"force",
|
||||
{},
|
||||
vim.lsp.protocol.make_client_capabilities(),
|
||||
cmp_lsp.default_capabilities()
|
||||
)
|
||||
|
||||
require("mason").setup()
|
||||
require("mason-lspconfig").setup({
|
||||
ensure_installed = {
|
||||
"clangd",
|
||||
"lua_ls",
|
||||
-- "ruby_lsp",
|
||||
-- "gopls",
|
||||
-- "tailwindcss",
|
||||
},
|
||||
handlers = {
|
||||
function(server_name) -- default
|
||||
require("lspconfig")[server_name].setup {
|
||||
capabilities = capabilities
|
||||
}
|
||||
end,
|
||||
require("mason").setup()
|
||||
require("mason-lspconfig").setup({
|
||||
ensure_installed = {
|
||||
"clangd",
|
||||
"lua_ls",
|
||||
-- "ruby_lsp",
|
||||
-- "gopls",
|
||||
-- "tailwindcss",
|
||||
},
|
||||
handlers = {
|
||||
function(server_name) -- default
|
||||
require("lspconfig")[server_name].setup {
|
||||
capabilities = capabilities
|
||||
}
|
||||
end,
|
||||
|
||||
["lua_ls"] = function()
|
||||
local lspconfig = require("lspconfig")
|
||||
lspconfig.lua_ls.setup {
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
Lua = {
|
||||
format = {
|
||||
enable = true,
|
||||
defaultConfig = { -- NOTE: string values only
|
||||
indent_style = "space",
|
||||
indent_size = "2",
|
||||
["lua_ls"] = function()
|
||||
local lspconfig = require("lspconfig")
|
||||
lspconfig.lua_ls.setup {
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
Lua = {
|
||||
format = {
|
||||
enable = true,
|
||||
defaultConfig = { -- NOTE: string values only
|
||||
indent_style = "space",
|
||||
indent_size = "2",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
end,
|
||||
}
|
||||
})
|
||||
}
|
||||
end,
|
||||
}
|
||||
})
|
||||
|
||||
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
||||
cmp.setup({
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-u>'] = cmp.mapping.scroll_docs(4),
|
||||
}),
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
-- vim.snippet.expand(args.body) -- TODO: native option, maybe try
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'luasnip' },
|
||||
}, {
|
||||
{ name = 'buffer' },
|
||||
}),
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
performance = {
|
||||
max_view_entries = 14,
|
||||
},
|
||||
})
|
||||
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
||||
cmp.setup({
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-u>'] = cmp.mapping.scroll_docs(4),
|
||||
}),
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
-- vim.snippet.expand(args.body) -- TODO: native option, maybe try
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'luasnip' },
|
||||
}, {
|
||||
{ name = 'buffer' },
|
||||
}),
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
performance = {
|
||||
max_view_entries = 14,
|
||||
},
|
||||
})
|
||||
|
||||
-- `/` cmdline setup.
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'path' }
|
||||
}, {
|
||||
{ name = 'cmdline' }
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false }
|
||||
})
|
||||
-- `/` cmdline setup.
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'path' }
|
||||
}, {
|
||||
{ name = 'cmdline' }
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false }
|
||||
})
|
||||
|
||||
vim.diagnostic.config({
|
||||
-- update_in_insert = true,
|
||||
float = {
|
||||
focusable = false,
|
||||
style = "minimal",
|
||||
border = "rounded",
|
||||
source = "always",
|
||||
header = "",
|
||||
prefix = "",
|
||||
},
|
||||
})
|
||||
vim.diagnostic.config({
|
||||
-- update_in_insert = true,
|
||||
float = {
|
||||
focusable = false,
|
||||
style = "minimal",
|
||||
border = "rounded",
|
||||
source = "always",
|
||||
header = "",
|
||||
prefix = "",
|
||||
},
|
||||
})
|
||||
|
||||
-- TODO: needed? seems like neovim/nvim-lspconfig covers by default
|
||||
-- vim.lsp.enable('clangd')
|
||||
-- vim.lsp.enable('ruby_lsp')
|
||||
-- vim.lsp.enable('standardrb')
|
||||
-- vim.lsp.enable('herb_ls') -- targets html + ruby (erb files)
|
||||
end,
|
||||
-- TODO: needed? seems like neovim/nvim-lspconfig covers by default
|
||||
-- vim.lsp.enable('clangd')
|
||||
-- vim.lsp.enable('ruby_lsp')
|
||||
-- vim.lsp.enable('standardrb')
|
||||
-- vim.lsp.enable('herb_ls') -- targets html + ruby (erb files)
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -1,4 +1,31 @@
|
||||
return {
|
||||
{
|
||||
"tiagovla/tokyodark.nvim",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
opts = {
|
||||
custom_highlights = function(highlights, _palette)
|
||||
highlights.Comment['fg'] = "#8a9097"
|
||||
highlights.LineNr['fg'] = "#8088A8"
|
||||
return highlights
|
||||
end,
|
||||
},
|
||||
},
|
||||
{
|
||||
'ribru17/bamboo.nvim',
|
||||
config = function()
|
||||
require('bamboo').setup { }
|
||||
require('bamboo').load()
|
||||
end,
|
||||
},
|
||||
{
|
||||
dir = vim.fn.stdpath("config") .. "/themes/pina",
|
||||
name = "pina",
|
||||
},
|
||||
{
|
||||
'steve-lohmeyer/mars.nvim',
|
||||
name = 'mars',
|
||||
},
|
||||
{
|
||||
"ellisonleao/gruvbox.nvim",
|
||||
name = "gruvbox",
|
||||
@@ -27,6 +54,7 @@ return {
|
||||
},
|
||||
},
|
||||
{
|
||||
-- even if not connected to a zz-this-box theme, keep this for nvim diffthis
|
||||
"rose-pine/neovim",
|
||||
name = "rose-pine",
|
||||
},
|
||||
@@ -44,27 +72,4 @@ return {
|
||||
end,
|
||||
},
|
||||
},
|
||||
{
|
||||
"tiagovla/tokyodark.nvim",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
opts = {
|
||||
custom_highlights = function(highlights, _palette)
|
||||
highlights.Comment['fg'] = "#8a9097"
|
||||
highlights.LineNr['fg'] = "#8088A8"
|
||||
return highlights
|
||||
end,
|
||||
},
|
||||
},
|
||||
{
|
||||
'ribru17/bamboo.nvim',
|
||||
config = function()
|
||||
require('bamboo').setup { }
|
||||
require('bamboo').load()
|
||||
end,
|
||||
},
|
||||
{
|
||||
dir = vim.fn.stdpath("config") .. "/themes/pina",
|
||||
name = "pina",
|
||||
},
|
||||
}
|
||||
|
||||
3
src_files/.config/zz-this-box/themes/mars/neovim.lua
Normal file
3
src_files/.config/zz-this-box/themes/mars/neovim.lua
Normal file
@@ -0,0 +1,3 @@
|
||||
return {
|
||||
colorscheme_name = 'mars'
|
||||
}
|
||||
2
src_files/.config/zz-this-box/themes/mars/tmux.conf
Normal file
2
src_files/.config/zz-this-box/themes/mars/tmux.conf
Normal file
@@ -0,0 +1,2 @@
|
||||
set-window-option -g window-style bg=default # transparency
|
||||
set-option -g status-style 'bg=default fg=#e07b5f'
|
||||
1
src_files/.config/zz-this-box/themes/pina/brave.theme
Normal file
1
src_files/.config/zz-this-box/themes/pina/brave.theme
Normal file
@@ -0,0 +1 @@
|
||||
125,176,133
|
||||
Reference in New Issue
Block a user