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

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

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,
     },

src_files/.config/nvim/lua/plugins_lazy/lsp.lua

@@ -1,4 +1,10 @@
 return {
+    {
+        "L3MON4D3/LuaSnip",
+        version = "v2.*",
+        -- build = "make install_jsregexp"
+    },
+    {
         "neovim/nvim-lspconfig",
         dependencies = {
             "stevearc/conform.nvim",
@@ -120,4 +126,5 @@ return {
             -- vim.lsp.enable('standardrb')
             -- vim.lsp.enable('herb_ls') -- targets html + ruby (erb files)
         end,
+    },
 }

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",
-    },
 }

src_files/.config/zz-this-box/themes/mars/neovim.lua

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

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'

src_files/.config/zz-this-box/themes/pina/brave.theme

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

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.

src_files/imports/themes-omarchy-extra/mars/chromium.theme

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

src_files/imports/themes-omarchy-extra/mars/hyprland.conf

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

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)

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

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;

src_files/imports/themes-omarchy-extra/pina/chromium.theme

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

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