fix merge

ghostty/.config/ghostty/themes/onelight

@@ -1,18 +1,18 @@
-palette = 0=#000000
+palette = 0=#1b1b1b
 palette = 1=#b6443a
 palette = 2=#40803f
 palette = 3=#795300
 palette = 4=#3360c1
 palette = 5=#841e83
 palette = 6=#006996
-palette = 7=#6d6d59
-palette = 8=#000000
-palette = 9=#b6443a
-palette = 10=#40803f
-palette = 11=#795300
-palette = 12=#3360c1
-palette = 13=#841e83
-palette = 14=#006996
-palette = 15=#ccccc0
+palette = 7=#a0a1a7
+palette = 8=#767676
+palette = 9=#e45649
+palette = 10=#50a14f
+palette = 11=#986801
+palette = 12=#4078f2
+palette = 13=#a626a4
+palette = 14=#0184bc
+palette = 15=#ffffff
 background = #eeeeee
 foreground = #2a2b33

nnn/.config/nnn/plugins/preview-tui

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+shopt -s extglob
 
 # Description: Terminal based file previewer
 #

opencode/.config/opencode/themes/onedark-black.json

@@ -0,0 +1,81 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "darkBg": "#000000",
+    "darkBgAlt": "#21252b",
+    "darkBgPanel": "#353b45",
+    "darkFg": "#abb2bf",
+    "darkFgMuted": "#5c6370",
+    "darkPurple": "#c678dd",
+    "darkBlue": "#61afef",
+    "darkRed": "#e06c75",
+    "darkGreen": "#98c379",
+    "darkYellow": "#e5c07b",
+    "darkOrange": "#d19a66",
+    "darkCyan": "#56b6c2",
+    "lightBg": "#eeeeee",
+    "lightBgAlt": "#e4e4e6",
+    "lightBgPanel": "#d6d6d9",
+    "lightFg": "#383a42",
+    "lightFgMuted": "#a0a1a7",
+    "lightPurple": "#a626a4",
+    "lightBlue": "#4078f2",
+    "lightRed": "#e45649",
+    "lightGreen": "#50a14f",
+    "lightYellow": "#c18401",
+    "lightOrange": "#986801",
+    "lightCyan": "#0184bc"
+  },
+  "theme": {
+    "primary": { "dark": "darkBlue", "light": "lightBlue" },
+    "secondary": { "dark": "darkPurple", "light": "lightPurple" },
+    "accent": { "dark": "darkCyan", "light": "lightCyan" },
+    "error": { "dark": "darkRed", "light": "lightRed" },
+    "warning": { "dark": "darkYellow", "light": "lightYellow" },
+    "success": { "dark": "darkGreen", "light": "lightGreen" },
+    "info": { "dark": "darkOrange", "light": "lightOrange" },
+    "text": { "dark": "darkFg", "light": "lightFg" },
+    "textMuted": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "background": { "dark": "darkBg", "light": "lightBg" },
+    "backgroundPanel": { "dark": "darkBgAlt", "light": "lightBgAlt" },
+    "backgroundElement": { "dark": "darkBgPanel", "light": "lightBgPanel" },
+    "border": { "dark": "#393f4a", "light": "#c6c6c8" },
+    "borderActive": { "dark": "darkBlue", "light": "lightBlue" },
+    "borderSubtle": { "dark": "#2c313a", "light": "#d5d5d7" },
+    "diffAdded": { "dark": "darkGreen", "light": "lightGreen" },
+    "diffRemoved": { "dark": "darkRed", "light": "lightRed" },
+    "diffContext": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "diffHunkHeader": { "dark": "darkCyan", "light": "lightCyan" },
+    "diffHighlightAdded": { "dark": "#aad482", "light": "#489447" },
+    "diffHighlightRemoved": { "dark": "#e8828b", "light": "#d65145" },
+    "diffAddedBg": { "dark": "#2c382b", "light": "#dce8db" },
+    "diffRemovedBg": { "dark": "#3a2d2f", "light": "#f0dbd9" },
+    "diffContextBg": { "dark": "darkBgAlt", "light": "lightBgAlt" },
+    "diffLineNumber": { "dark": "#9398a2", "light": "#666666" },
+    "diffAddedLineNumberBg": { "dark": "#283427", "light": "#d3e4d1" },
+    "diffRemovedLineNumberBg": { "dark": "#36292b", "light": "#e9d1cf" },
+    "markdownText": { "dark": "darkFg", "light": "lightFg" },
+    "markdownHeading": { "dark": "darkPurple", "light": "lightPurple" },
+    "markdownLink": { "dark": "darkBlue", "light": "lightBlue" },
+    "markdownLinkText": { "dark": "darkCyan", "light": "lightCyan" },
+    "markdownCode": { "dark": "darkGreen", "light": "lightGreen" },
+    "markdownBlockQuote": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "markdownEmph": { "dark": "darkYellow", "light": "lightYellow" },
+    "markdownStrong": { "dark": "darkOrange", "light": "lightOrange" },
+    "markdownHorizontalRule": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "markdownListItem": { "dark": "darkBlue", "light": "lightBlue" },
+    "markdownListEnumeration": { "dark": "darkCyan", "light": "lightCyan" },
+    "markdownImage": { "dark": "darkBlue", "light": "lightBlue" },
+    "markdownImageText": { "dark": "darkCyan", "light": "lightCyan" },
+    "markdownCodeBlock": { "dark": "darkFg", "light": "lightFg" },
+    "syntaxComment": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "syntaxKeyword": { "dark": "darkPurple", "light": "lightPurple" },
+    "syntaxFunction": { "dark": "darkBlue", "light": "lightBlue" },
+    "syntaxVariable": { "dark": "darkRed", "light": "lightRed" },
+    "syntaxString": { "dark": "darkGreen", "light": "lightGreen" },
+    "syntaxNumber": { "dark": "darkOrange", "light": "lightOrange" },
+    "syntaxType": { "dark": "darkYellow", "light": "lightYellow" },
+    "syntaxOperator": { "dark": "darkCyan", "light": "lightCyan" },
+    "syntaxPunctuation": { "dark": "darkFg", "light": "lightFg" }
+  }
+}

opencode/.config/opencode/tui.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://opencode.ai/tui.json",
+  "theme": "onedark-black"
+}

tmux/.tmux.conf

@@ -34,8 +34,8 @@ bind-key m command-prompt -p "send pane to:"  "join-pane -t :'%%'"
 set -s escape-time 0
 
 # True color support
-# set -g default-terminal "tmux-256color"
-# set-option -ga terminal-overrides ",*256col*:Tc"
+set -g default-terminal "tmux-256color"
+set-option -ga terminal-overrides ",*256col*:Tc"
 
 # Allow OSC 11 background queries to pass through
 set -g allow-passthrough on