david/dotfiles-and-setup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import omarcy-mars-theme and local files, reformat & rename other files

Browse Source
This commit is contained in:
david.pickle
2025-11-14 14:03:55 -06:00
parent 5c9820d069
commit 97519acea1
19 changed files with 238 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src_files/.config/kitty/kitty.conf
View File

@@ -20,7 +20,7 @@ macos_custom_beam_cursor yes
# theme stuff # theme stuff
# NOTE: on linux, may want background_opacity at 1.0 and let hyprland handle transparency # NOTE: on linux, may want background_opacity at 1.0 and let hyprland handle transparency
include ~/.config/kitty/theme.conf include ~/.config/kitty/theme.conf
background_opacity 0.95 background_opacity 0.94
# etc # etc
enable_audio_bell no enable_audio_bell no

2
src_files/.config/nvim/lua/plugins_lazy/harpoon.lua
View File

@@ -8,7 +8,7 @@ return {
settings = { settings = {
save_on_toggle = true, save_on_toggle = true,
sync_on_ui_close = true, sync_on_ui_close = true,
} },
}) })
end, end,
}, },

227
src_files/.config/nvim/lua/plugins_lazy/lsp.lua
View File

@@ -1,123 +1,130 @@
return { return {
"neovim/nvim-lspconfig", {
dependencies = { "L3MON4D3/LuaSnip",
"stevearc/conform.nvim", version = "v2.*",
"williamboman/mason.nvim", -- build = "make install_jsregexp"
"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
}, },
{
"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() config = function()
require("conform").setup({ formatters_by_ft = {} }) require("conform").setup({ formatters_by_ft = {} })
local cmp = require('cmp') local cmp = require('cmp')
local cmp_lsp = require("cmp_nvim_lsp") local cmp_lsp = require("cmp_nvim_lsp")
local capabilities = vim.tbl_deep_extend( local capabilities = vim.tbl_deep_extend(
"force", "force",
{}, {},
vim.lsp.protocol.make_client_capabilities(), vim.lsp.protocol.make_client_capabilities(),
cmp_lsp.default_capabilities() cmp_lsp.default_capabilities()
) )
require("mason").setup() require("mason").setup()
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
ensure_installed = { ensure_installed = {
"clangd", "clangd",
"lua_ls", "lua_ls",
-- "ruby_lsp", -- "ruby_lsp",
-- "gopls", -- "gopls",
-- "tailwindcss", -- "tailwindcss",
}, },
handlers = { handlers = {
function(server_name) -- default function(server_name) -- default
require("lspconfig")[server_name].setup { require("lspconfig")[server_name].setup {
capabilities = capabilities capabilities = capabilities
} }
end, end,
["lua_ls"] = function() ["lua_ls"] = function()
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
lspconfig.lua_ls.setup { lspconfig.lua_ls.setup {
capabilities = capabilities, capabilities = capabilities,
settings = { settings = {
Lua = { Lua = {
format = { format = {
enable = true, enable = true,
defaultConfig = { -- NOTE: string values only defaultConfig = { -- NOTE: string values only
indent_style = "space", indent_style = "space",
indent_size = "2", indent_size = "2",
},
}, },
}, },
}, },
}, }
} end,
end, }
} })
})
local cmp_select = { behavior = cmp.SelectBehavior.Select } local cmp_select = { behavior = cmp.SelectBehavior.Select }
cmp.setup({ cmp.setup({
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
["<C-Space>"] = cmp.mapping.complete(), ["<C-Space>"] = cmp.mapping.complete(),
['<C-y>'] = cmp.mapping.confirm({ select = true }), ['<C-y>'] = cmp.mapping.confirm({ select = true }),
['<C-n>'] = cmp.mapping.select_next_item(cmp_select), ['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select), ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
['<C-d>'] = cmp.mapping.scroll_docs(-4), ['<C-d>'] = cmp.mapping.scroll_docs(-4),
['<C-u>'] = cmp.mapping.scroll_docs(4), ['<C-u>'] = cmp.mapping.scroll_docs(4),
}), }),
snippet = { snippet = {
expand = function(args) expand = function(args)
-- vim.snippet.expand(args.body) -- TODO: native option, maybe try -- vim.snippet.expand(args.body) -- TODO: native option, maybe try
require('luasnip').lsp_expand(args.body) require('luasnip').lsp_expand(args.body)
end, end,
}, },
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ name = 'luasnip' }, { name = 'luasnip' },
}, { }, {
{ name = 'buffer' }, { name = 'buffer' },
}), }),
window = { window = {
completion = cmp.config.window.bordered(), completion = cmp.config.window.bordered(),
documentation = cmp.config.window.bordered(), documentation = cmp.config.window.bordered(),
}, },
performance = { performance = {
max_view_entries = 14, max_view_entries = 14,
}, },
}) })
-- `/` cmdline setup. -- `/` cmdline setup.
cmp.setup.cmdline(':', { cmp.setup.cmdline(':', {
mapping = cmp.mapping.preset.cmdline(), mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = 'path' } { name = 'path' }
}, { }, {
{ name = 'cmdline' } { name = 'cmdline' }
}), }),
matching = { disallow_symbol_nonprefix_matching = false } matching = { disallow_symbol_nonprefix_matching = false }
}) })
vim.diagnostic.config({ vim.diagnostic.config({
-- update_in_insert = true, -- update_in_insert = true,
float = { float = {
focusable = false, focusable = false,
style = "minimal", style = "minimal",
border = "rounded", border = "rounded",
source = "always", source = "always",
header = "", header = "",
prefix = "", prefix = "",
}, },
}) })
-- TODO: needed? seems like neovim/nvim-lspconfig covers by default -- TODO: needed? seems like neovim/nvim-lspconfig covers by default
-- vim.lsp.enable('clangd') -- vim.lsp.enable('clangd')
-- vim.lsp.enable('ruby_lsp') -- vim.lsp.enable('ruby_lsp')
-- vim.lsp.enable('standardrb') -- vim.lsp.enable('standardrb')
-- vim.lsp.enable('herb_ls') -- targets html + ruby (erb files) -- vim.lsp.enable('herb_ls') -- targets html + ruby (erb files)
end, end,
},
} }

51
src_files/.config/nvim/lua/plugins_lazy/themes.lua
View File

@@ -1,4 +1,31 @@
return { 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", "ellisonleao/gruvbox.nvim",
name = "gruvbox", 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", "rose-pine/neovim",
name = "rose-pine", name = "rose-pine",
}, },
@@ -44,27 +72,4 @@ return {
end, 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
View File

@@ -0,0 +1,3 @@
return {
colorscheme_name = 'mars'
}

2
src_files/.config/zz-this-box/themes/mars/tmux.conf Normal file
View 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
View File

@@ -0,0 +1 @@
125,176,133

21
src_files/imports/themes-omarchy-extra/mars/LICENSE Normal file
View File

@@ -0,0 +1,21 @@
MIT License
Copyright (c) 2025 Steve Lohmeyer
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

BIN
src_files/imports/themes-omarchy-extra/mars/backgrounds/01-mars-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 MiB

BIN
src_files/imports/themes-omarchy-extra/mars/backgrounds/02-mars-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 MiB

BIN
src_files/imports/themes-omarchy-extra/mars/backgrounds/03-mars-2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 MiB

1
src_files/imports/themes-omarchy-extra/mars/chromium.theme Normal file
View File

@@ -0,0 +1 @@
45,26,26

4
src_files/imports/themes-omarchy-extra/mars/hyprland.conf Normal file
View File

@@ -0,0 +1,4 @@
general {
col.active_border = rgba(C45A3Fff) rgba(7B534Eff) 45deg
}

5
src_files/imports/themes-omarchy-extra/mars/hyprlock.conf Normal file
View File

@@ -0,0 +1,5 @@
$color = rgba(00, 00, 00, 1.0)
$inner_color = rgba(47, 27, 27, 0.8)
$outer_color = rgba(217, 175, 167, 1.0)
$font_color = rgba(217, 175, 167, 1.0)
$check_color = rgba(255, 107, 74, 1.0)

39
src_files/imports/themes-omarchy-extra/mars/kitty.conf Normal file
View File

@@ -0,0 +1,39 @@
## original name ghostty.conf
## license: MIT
## author: Steve Lohmeyer (github: steve-lohmeyer)
## upstream: https://github.com/steve-lohmeyer/omarchy-mars-theme/blob/master/ghostty.conf
# This file is adapted from the ghostty.conf theme file from omarchy-mars-theme
# (https://github.com/steve-lohmeyer/omarchy-mars-theme).
##########################################################################################
foreground #D9AFA7
background #000000
selection_foreground #000000
selection_background #4A2C2C
active_tab_foreground #000000
active_tab_background #D9AFA7
inactive_tab_foreground #D9AFA7
inactive_tab_background #000000
cursor #FF6B4A
cursor_text_color #000000
# black, red, green, yellow, blue, magenta, cyan, white
color0 #000000
color1 #E07B5F
color2 #7B534E
color3 #C45A3F
color4 #7B534E
color5 #A0392F
color6 #7B534E
color7 #D9AFA7
# black, red, green, yellow, blue, magenta, cyan, white
color8 #4A2C2C
color9 #FF6B4A
color10 #7B534E
color11 #E07B5F
color12 #7B534E
color13 #C45A3F
color14 #7B534E
color15 #D9AFA7

3
src_files/imports/themes-omarchy-extra/mars/waybar.css Normal file
View File

@@ -0,0 +1,3 @@
/* Waybar CSS for Mars theme */
@define-color foreground #D9AFA7;
@define-color background #000000;

0
src_files/imports/themes-omarchy-extra/pina/backgrounds/01-pina-bg-1.jpg → src_files/imports/themes-omarchy-extra/pina/backgrounds/01-pina-2.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 549 KiB

After

Width:  |  Height:  |  Size: 549 KiB

1
src_files/imports/themes-omarchy-extra/pina/chromium.theme
View File

@@ -1 +0,0 @@
224,212,128

37
src_files/imports/themes-omarchy-extra/pina/kitty.conf
View File

@@ -1,6 +1,6 @@
## original name ghostty.conf ## original name ghostty.conf
## author: bjarneo (aka: iamdothash)
## license: (no license was specified) ## license: (no license was specified)
## author: bjarneo (aka: iamdothash)
## upstream: https://github.com/bjarneo/omarchy-pina-theme/blob/main/ghostty.conf ## upstream: https://github.com/bjarneo/omarchy-pina-theme/blob/main/ghostty.conf
# This file is adapted from the ghostty.conf theme file from omarchy-pina-theme # This file is adapted from the ghostty.conf theme file from omarchy-pina-theme
@@ -12,42 +12,29 @@ foreground #D4D5D5
background #171A18 background #171A18
selection_foreground #171A18 selection_foreground #171A18
selection_background #D4D5D5 selection_background #D4D5D5
cursor #E4DAD9
cursor_text_color #070A08
active_tab_foreground #171A18 active_tab_foreground #171A18
active_tab_background #D4D5D5 active_tab_background #D4D5D5
inactive_tab_foreground #D4D5D5 inactive_tab_foreground #D4D5D5
inactive_tab_background #171A18 inactive_tab_background #171A18
cursor #E4DAD9
cursor_text_color #070A08
# black # black, red, green, yellow, blue, magenta, cyan, white
color0 #171A18 color0 #171A18
color8 #6B8071
# red
color1 #7DB085 color1 #7DB085
color9 #8CC098
# green
color2 #B8C082 color2 #B8C082
color10 #CDD590
# yellow
color3 #E0D480 color3 #E0D480
color11 #F2E590
# blue
color4 #7DD2B8 color4 #7DD2B8
color12 #92E2C8
# magenta
color5 #B5C9A4 color5 #B5C9A4
color13 #C8DAB8
# cyan
color6 #C5E8C5 color6 #C5E8C5
color14 #D8F5D8
# white
color7 #D4D5D5 color7 #D4D5D5
# black, red, green, yellow, blue, magenta, cyan, white
color8 #6B8071
color9 #8CC098
color10 #CDD590
color11 #F2E590
color12 #92E2C8
color13 #C8DAB8
color14 #D8F5D8
color15 #E2E3E3 color15 #E2E3E3