diff --git a/src_files/.config/kitty/kitty.conf b/src_files/.config/kitty/kitty.conf index 4746cdb..3a20472 100644 --- a/src_files/.config/kitty/kitty.conf +++ b/src_files/.config/kitty/kitty.conf @@ -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 diff --git a/src_files/.config/nvim/lua/plugins_lazy/harpoon.lua b/src_files/.config/nvim/lua/plugins_lazy/harpoon.lua index ed3b58b..6bb362c 100644 --- a/src_files/.config/nvim/lua/plugins_lazy/harpoon.lua +++ b/src_files/.config/nvim/lua/plugins_lazy/harpoon.lua @@ -8,7 +8,7 @@ return { settings = { save_on_toggle = true, sync_on_ui_close = true, - } + }, }) end, }, diff --git a/src_files/.config/nvim/lua/plugins_lazy/lsp.lua b/src_files/.config/nvim/lua/plugins_lazy/lsp.lua index 7e75ff9..1dd9b20 100644 --- a/src_files/.config/nvim/lua/plugins_lazy/lsp.lua +++ b/src_files/.config/nvim/lua/plugins_lazy/lsp.lua @@ -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({ - [""] = cmp.mapping.complete(), - [''] = cmp.mapping.confirm({ select = true }), - [''] = cmp.mapping.select_next_item(cmp_select), - [''] = cmp.mapping.select_prev_item(cmp_select), - [''] = cmp.mapping.scroll_docs(-4), - [''] = 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({ + [""] = cmp.mapping.complete(), + [''] = cmp.mapping.confirm({ select = true }), + [''] = cmp.mapping.select_next_item(cmp_select), + [''] = cmp.mapping.select_prev_item(cmp_select), + [''] = cmp.mapping.scroll_docs(-4), + [''] = 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, + }, } diff --git a/src_files/.config/nvim/lua/plugins_lazy/themes.lua b/src_files/.config/nvim/lua/plugins_lazy/themes.lua index c6c6d57..607924b 100644 --- a/src_files/.config/nvim/lua/plugins_lazy/themes.lua +++ b/src_files/.config/nvim/lua/plugins_lazy/themes.lua @@ -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", - }, } diff --git a/src_files/.config/zz-this-box/themes/mars/neovim.lua b/src_files/.config/zz-this-box/themes/mars/neovim.lua new file mode 100644 index 0000000..bed19dd --- /dev/null +++ b/src_files/.config/zz-this-box/themes/mars/neovim.lua @@ -0,0 +1,3 @@ +return { + colorscheme_name = 'mars' +} diff --git a/src_files/.config/zz-this-box/themes/mars/tmux.conf b/src_files/.config/zz-this-box/themes/mars/tmux.conf new file mode 100644 index 0000000..8f21a27 --- /dev/null +++ b/src_files/.config/zz-this-box/themes/mars/tmux.conf @@ -0,0 +1,2 @@ +set-window-option -g window-style bg=default # transparency +set-option -g status-style 'bg=default fg=#e07b5f' diff --git a/src_files/.config/zz-this-box/themes/pina/brave.theme b/src_files/.config/zz-this-box/themes/pina/brave.theme new file mode 100644 index 0000000..8ec6e62 --- /dev/null +++ b/src_files/.config/zz-this-box/themes/pina/brave.theme @@ -0,0 +1 @@ +125,176,133 diff --git a/src_files/imports/themes-omarchy-extra/mars/LICENSE b/src_files/imports/themes-omarchy-extra/mars/LICENSE new file mode 100644 index 0000000..d48194a --- /dev/null +++ b/src_files/imports/themes-omarchy-extra/mars/LICENSE @@ -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. diff --git a/src_files/imports/themes-omarchy-extra/mars/backgrounds/01-mars-3.png b/src_files/imports/themes-omarchy-extra/mars/backgrounds/01-mars-3.png new file mode 100644 index 0000000..f884f0b Binary files /dev/null and b/src_files/imports/themes-omarchy-extra/mars/backgrounds/01-mars-3.png differ diff --git a/src_files/imports/themes-omarchy-extra/mars/backgrounds/02-mars-1.png b/src_files/imports/themes-omarchy-extra/mars/backgrounds/02-mars-1.png new file mode 100644 index 0000000..5a12a5d Binary files /dev/null and b/src_files/imports/themes-omarchy-extra/mars/backgrounds/02-mars-1.png differ diff --git a/src_files/imports/themes-omarchy-extra/mars/backgrounds/03-mars-2.jpg b/src_files/imports/themes-omarchy-extra/mars/backgrounds/03-mars-2.jpg new file mode 100644 index 0000000..cb0c5d8 Binary files /dev/null and b/src_files/imports/themes-omarchy-extra/mars/backgrounds/03-mars-2.jpg differ diff --git a/src_files/imports/themes-omarchy-extra/mars/chromium.theme b/src_files/imports/themes-omarchy-extra/mars/chromium.theme new file mode 100644 index 0000000..30429ee --- /dev/null +++ b/src_files/imports/themes-omarchy-extra/mars/chromium.theme @@ -0,0 +1 @@ +45,26,26 diff --git a/src_files/imports/themes-omarchy-extra/mars/hyprland.conf b/src_files/imports/themes-omarchy-extra/mars/hyprland.conf new file mode 100644 index 0000000..61e7319 --- /dev/null +++ b/src_files/imports/themes-omarchy-extra/mars/hyprland.conf @@ -0,0 +1,4 @@ +general { + col.active_border = rgba(C45A3Fff) rgba(7B534Eff) 45deg +} + diff --git a/src_files/imports/themes-omarchy-extra/mars/hyprlock.conf b/src_files/imports/themes-omarchy-extra/mars/hyprlock.conf new file mode 100644 index 0000000..e78b2ee --- /dev/null +++ b/src_files/imports/themes-omarchy-extra/mars/hyprlock.conf @@ -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) diff --git a/src_files/imports/themes-omarchy-extra/mars/kitty.conf b/src_files/imports/themes-omarchy-extra/mars/kitty.conf new file mode 100644 index 0000000..0d34489 --- /dev/null +++ b/src_files/imports/themes-omarchy-extra/mars/kitty.conf @@ -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 diff --git a/src_files/imports/themes-omarchy-extra/mars/waybar.css b/src_files/imports/themes-omarchy-extra/mars/waybar.css new file mode 100644 index 0000000..9bdd264 --- /dev/null +++ b/src_files/imports/themes-omarchy-extra/mars/waybar.css @@ -0,0 +1,3 @@ +/* Waybar CSS for Mars theme */ +@define-color foreground #D9AFA7; +@define-color background #000000; diff --git a/src_files/imports/themes-omarchy-extra/pina/backgrounds/01-pina-bg-1.jpg b/src_files/imports/themes-omarchy-extra/pina/backgrounds/01-pina-2.jpg similarity index 100% rename from src_files/imports/themes-omarchy-extra/pina/backgrounds/01-pina-bg-1.jpg rename to src_files/imports/themes-omarchy-extra/pina/backgrounds/01-pina-2.jpg diff --git a/src_files/imports/themes-omarchy-extra/pina/chromium.theme b/src_files/imports/themes-omarchy-extra/pina/chromium.theme deleted file mode 100644 index 782d4bd..0000000 --- a/src_files/imports/themes-omarchy-extra/pina/chromium.theme +++ /dev/null @@ -1 +0,0 @@ -224,212,128 diff --git a/src_files/imports/themes-omarchy-extra/pina/kitty.conf b/src_files/imports/themes-omarchy-extra/pina/kitty.conf index 3fca173..8a14fa6 100644 --- a/src_files/imports/themes-omarchy-extra/pina/kitty.conf +++ b/src_files/imports/themes-omarchy-extra/pina/kitty.conf @@ -1,6 +1,6 @@ ## original name ghostty.conf -## author: bjarneo (aka: iamdothash) ## license: (no license was specified) +## author: bjarneo (aka: iamdothash) ## 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 @@ -12,42 +12,29 @@ foreground #D4D5D5 background #171A18 selection_foreground #171A18 selection_background #D4D5D5 -cursor #E4DAD9 -cursor_text_color #070A08 active_tab_foreground #171A18 active_tab_background #D4D5D5 inactive_tab_foreground #D4D5D5 inactive_tab_background #171A18 +cursor #E4DAD9 +cursor_text_color #070A08 -# black +# black, red, green, yellow, blue, magenta, cyan, white color0 #171A18 -color8 #6B8071 - -# red color1 #7DB085 -color9 #8CC098 - -# green color2 #B8C082 -color10 #CDD590 - -# yellow color3 #E0D480 -color11 #F2E590 - -# blue color4 #7DD2B8 -color12 #92E2C8 - -# magenta color5 #B5C9A4 -color13 #C8DAB8 - -# cyan color6 #C5E8C5 -color14 #D8F5D8 - -# white 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