diff --git a/brew/.Brewfile b/brew/.Brewfile index 95cd1dc..ff7461e 100644 --- a/brew/.Brewfile +++ b/brew/.Brewfile @@ -8,6 +8,8 @@ brew "tmux" brew "fzf" brew "zoxide" brew "opencode" +brew "colima" +brew "docker" # Utilities brew "ripgrep" @@ -25,10 +27,24 @@ cask "font-jetbrains-mono-nerd-font" # Languages & Runtimes brew "python" + brew "cmake" +brew "clang-format" + brew "node" +brew "vtsls" +brew "vscode-langservers-extracted" +brew "prettier" + brew "go" +brew "gopls" +brew "goimports" + brew "uv" + brew "lua" +brew "lua-language-server" +brew "stylua" + brew "bun" brew "tree-sitter-cli" diff --git a/ghostty/.config/ghostty/config b/ghostty/.config/ghostty/config index 2c16d09..d3e26c3 100644 --- a/ghostty/.config/ghostty/config +++ b/ghostty/.config/ghostty/config @@ -1,6 +1,6 @@ theme = kanso-zen +# theme = koda-dark font-family = "JetBrainsMono Nerd Font Medium" -font-thicken = true font-size = 14 scrollback-limit-bytes = 10000 @@ -10,6 +10,6 @@ macos-option-as-alt = true title = " " confirm-close-surface = false window-padding-x = 5 -window-padding-y = 5, 0 +window-padding-y = 2 mouse-hide-while-typing = true copy-on-select = clipboard diff --git a/ghostty/.config/ghostty/themes/kanso-zen b/ghostty/.config/ghostty/themes/kanso-zen index c32bc73..773d4d1 100644 --- a/ghostty/.config/ghostty/themes/kanso-zen +++ b/ghostty/.config/ghostty/themes/kanso-zen @@ -1,4 +1,5 @@ -palette = 0=#090E13 +# palette = 0=#090E13 +palette = 0=#0E0E0E palette = 1=#c4746e palette = 2=#8a9a7b palette = 3=#c4b28a @@ -15,7 +16,8 @@ palette = 13=#938aa9 palette = 14=#7aa89f palette = 15=#c5c9c7 -background = #090E13 +# background = #090E13 +background = #0E0E0E foreground = #c5c9c7 cursor-color = #c5c9c7 selection-background = #22262D diff --git a/ghostty/.config/ghostty/themes/koda-dark b/ghostty/.config/ghostty/themes/koda-dark new file mode 100644 index 0000000..1c1fa2e --- /dev/null +++ b/ghostty/.config/ghostty/themes/koda-dark @@ -0,0 +1,34 @@ +# Forces bold text to use the bright color palette +bold-is-bright = true + +# Background and foreground +# background = #101010 +background = #0E0E0E +foreground = #ffffff + +# Cursor colors +cursor-color = #b0b0b0 +cursor-text = #101010 + +# Selection colors +selection-background = #272727 +selection-foreground = #b0b0b0 + +# ANSI color palette (0-15) +# palette = 0=#101010 +palette = 0=#0E0E0E +palette = 1=#ff7676 +palette = 2=#a3d6a3 +palette = 3=#ffffff +palette = 4=#b3b3b3 +palette = 5=#f4b8e4 +palette = 6=#fafafa +palette = 7=#a5adce +palette = 8=#50585d +palette = 9=#ff5733 +palette = 10=#86cd82 +palette = 11=#d9ba73 +palette = 12=#ffffff +palette = 13=#f2a4db +palette = 14=#5abfb5 +palette = 15=#b5bfe2 diff --git a/nvim/.config/nvim/colors/minimal.lua b/nvim/.config/nvim/colors/minimal.lua index 380071f..664771f 100644 --- a/nvim/.config/nvim/colors/minimal.lua +++ b/nvim/.config/nvim/colors/minimal.lua @@ -20,11 +20,33 @@ local c = { purple = '#a292a3', } +if vim.o.background == 'light' then + c.bg = '#f7f7f7' + c.bg_alt = '#e8e8e8' + c.fg = '#111111' + c.gray1 = '#d8d8d8' + c.gray2 = '#a8a8a8' + c.gray3 = '#7a7a7a' + c.gray4 = '#626262' + c.gray6 = '#3d3d3d' + c.gray7 = '#2e2e2e' + c.gray8 = '#1f1f1f' + c.gray9 = '#0a0a0a' + c.bright_blue = '#2a2a2a' + c.faded_blue = '#4a4a4a' + c.neutral_red = '#111111' + c.neutral_green = '#2b2b2b' + c.neutral_blue = '#555555' + c.orange = '#3a3a3a' + c.green = '#9a9a9a' + c.purple = '#1f1f1f' +end + vim.api.nvim_command('hi clear') if vim.fn.exists('syntax_on') then vim.api.nvim_command('syntax reset') end -vim.g.colors_name = 'monochrome' +vim.g.colors_name = 'minimal' -- Core vim.api.nvim_set_hl(0, 'Normal', { fg = c.fg, bg = c.bg }) @@ -52,8 +74,9 @@ vim.api.nvim_set_hl(0, 'NonText', { fg = c.green }) vim.api.nvim_set_hl(0, 'Whitespace', { fg = c.gray2 }) vim.api.nvim_set_hl(0, 'WinSeparator', { fg = c.gray3, bg = c.bg }) -vim.api.nvim_set_hl(0, 'StatusLine', { fg = c.fg, bg = c.gray1 }) -vim.api.nvim_set_hl(0, 'StatusLineNC', { fg = c.gray6, bg = c.gray1 }) +vim.api.nvim_set_hl(0, 'StatusLine', { fg = c.fg, bg = c.bg_alt }) +vim.api.nvim_set_hl(0, 'StatusLineNC', { fg = c.gray6, bg = c.bg_alt }) +vim.api.nvim_set_hl(0, 'FloatBorder', { fg = c.gray3, bg = c.bg }) vim.api.nvim_set_hl(0, 'DiffAdd', { fg = c.neutral_green }) vim.api.nvim_set_hl(0, 'DiffChange', { fg = c.neutral_blue }) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 392656e..e26abcb 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -43,8 +43,23 @@ vim.pack.add({ -- vim.cmd.colorscheme('minikanso-zen') -- vim.cmd.colorscheme('minikoda-dark') +-- vim.o.background = 'light' vim.cmd.colorscheme('minimal') +vim.api.nvim_create_user_command('Theme', function(opts) + local mode = opts.args + if mode == '' or mode == 'toggle' then + mode = vim.o.background == 'light' and 'dark' or 'light' + end + vim.o.background = mode +end, { + nargs = '?', + complete = function() + return { 'light', 'dark', 'toggle' } + end, +}) +vim.keymap.set('n', 't', ':Theme', { desc = 'Toggle light/dark theme' }) + local parsers = { 'lua', 'luadoc', diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 6532622..d41f1bc 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -1,3 +1,5 @@ +Include /Users/andrew/.colima/ssh_config + Host * AddKeysToAgent yes UseKeychain yes # macOS specific diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index d097db7..9551d48 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -1,5 +1,12 @@ -set -g prefix C-Space -bind C-Space send-prefix +unbind C-b + +# 1. Set your primary prefix (Meh + A via CSI u) +set-option -g prefix C-M-S-a +bind-key C-M-S-a send-prefix + +# 2. Set Ctrl + Space as your fallback/secondary prefix +set-option -g prefix2 C-Space +bind-key C-Space send-prefix set -s escape-time 0 set -g focus-events on @@ -8,6 +15,8 @@ set -g set-clipboard on set -g detach-on-destroy off set -g status off +set -s extended-keys on +set -as terminal-features 'xterm*:extkeys,ghostty*:extkeys' set -g default-terminal "tmux-256color" set -as terminal-overrides ',xterm*:Tc,ghostty:RGB'