Compare commits

..

17 Commits

Author SHA1 Message Date
Matt Anderson
e85d124e24 eeeeee bg for light 2026-07-24 14:02:26 -05:00
mannders00
673239f5d7 nvim and tmux colors 2026-07-16 09:20:41 -05:00
mannders00
a67a930dca monodark monolight 2026-07-14 09:33:13 -05:00
mannders00
62108214cc more variations of org filters for different areas of my life 2026-06-30 18:42:17 -05:00
Matt Anderson
959d94f5d6 k9s themes for base16 default 2026-06-23 11:11:13 -05:00
Matt Anderson
97b19d3e14 base16 light mode has computed higher contrast colors, with some opencode theme adjustments to use same colors but line up with neovim syntax groups 2026-06-23 11:00:46 -05:00
Matt Anderson
f9d2fbe5ec transparent k9s with base16 terminal works well 2026-06-22 10:11:15 -05:00
Matt Anderson
16e7ebbb98 opencode base16 default native themes 2026-06-22 10:10:31 -05:00
mannders00
5da0d592b0 add base16 default dark and light color scheme 2026-06-22 09:01:06 -05:00
Matt Anderson
70e3bdb0f5 just remove custom ember theme, my light ghostty theme with nvim just inheriting defaults is more readable and feels more vanilla anyway. i wanted something new, that is ghostty using ember theme, and i'm really loving it over an extended time period. it looks great, same colors as onedark/onelight, but muted and readable. awesome. just use ANSI colors from terminal wherever i can. 2026-06-11 14:16:35 -05:00
Matt Anderson
c50b3005b2 last change, tone down some bright reds in my nvim view, this time folder labels in nvim-tree 2026-06-09 15:51:17 -05:00
Matt Anderson
6ecff62a9d optimize ember theme and switch back to nvim-treesitter as its stable on main 2026-06-09 15:19:57 -05:00
Matt Anderson
65c6a3922c using official ember theme for neovim now, looks different and philosophy around neutral readibility with some fire accents, i like it 2026-06-09 14:58:21 -05:00
Matt Anderson
771e43f2da opencode native ember theme for system appearance caching strangeness 2026-06-08 15:08:10 -05:00
Matt Anderson
caffd1264b make text legible on ember light 2026-06-02 13:30:05 -05:00
Matt Anderson
2b1fe7e6aa merge 2026-05-29 17:52:16 -05:00
Matt Anderson
71fe62d71c many updates 2026-05-29 17:50:15 -05:00
26 changed files with 904 additions and 116 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
k9s/.config/k9s/clusters/**

View File

@@ -6,6 +6,14 @@ export PATH=$PATH:~/go/bin
export PATH=$PATH:/usr/local/go/bin
export PATH=$PATH:/Users/matt/Development/Applications/dart-sass
# extern
export BUN_INSTALL="$HOME/.bun"
export PATH=$BUN_INSTALL/bin:$PATH
# k9s
export K9S_CONFIG_DIR=~/.config/k9s
export EDITOR='nvim'
set -o vi
bind -m vi-command 'Control-l: clear-screen'
bind -m vi-insert 'Control-l: clear-screen'
@@ -27,11 +35,6 @@ alias gp='git push'
alias k9s='$HOME/doc/dev/dotfiles/k9s/.config/k9s/k9s-theme-sync.sh'
alias oc='opencode'
export EDITOR='nvim'
# export PATH=$PATH:/home/matt/Applications/lua_ls/bin
# k9s
export K9S_CONFIG_DIR=~/.config/k9s
# ~/.bashrc: executed by bash(1) for non-login shells.
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
@@ -183,9 +186,6 @@ fi
#. "$HOME/.cargo/env"
#
# bun
export BUN_INSTALL="$HOME/.bun"
export PATH=$BUN_INSTALL/bin:$PATH
# Load bash-completion
# if [ -f "$(brew --prefix)/etc/profile.d/bash_completion.sh" ]; then
@@ -198,12 +198,8 @@ alias kc=kubecolor
export MANPAGER='nvim +Man!'
export FLYCTL_INSTALL="/home/matt/.fly"
export PATH="$FLYCTL_INSTALL/bin:$PATH"
export PATH="$PATH:/Users/matt/.foundry/bin"
# Created by `pipx` on 2026-04-22 15:46:28
export PATH="$PATH:/Users/matt/.local/bin"
# Generated for envman. Do not edit.
[ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"
# opencode
export PATH=/Users/matt/.opencode/bin:$PATH

View File

@@ -1,5 +1,7 @@
# theme = onedark
theme = dark:ember,light:ember-light
theme = dark:monodark,light:monolight
# enforce legible text on washed-out colors (esp. light theme)
minimum-contrast = 1.15
# fonts
font-family = SFMono Nerd Font

View File

@@ -0,0 +1,30 @@
# Scheme: Default Dark
# Generated by Ghostty Base16 Converter
background = 181818
foreground = d8d8d8
selection-background = 383838
selection-foreground = 181818
palette = 0=#181818
palette = 1=#ab4642
palette = 2=#a1b56c
palette = 3=#f7ca88
palette = 4=#7cafc2
palette = 5=#ba8baf
palette = 6=#86c1b9
palette = 7=#d8d8d8
palette = 8=#585858
palette = 9=#ab4642
palette = 10=#a1b56c
palette = 11=#f7ca88
palette = 12=#7cafc2
palette = 13=#ba8baf
palette = 14=#86c1b9
palette = 15=#f8f8f8
palette = 16=#dc9656
palette = 17=#a16946
palette = 18=#282828
palette = 19=#383838
palette = 20=#b8b8b8
palette = 21=#e8e8e8

View File

@@ -0,0 +1,35 @@
# Scheme: Default Light
# Generated by Ghostty Base16 Converter
# NOTE: accent slots darkened from stock base16 to clear WCAG AA on the light
# background (#f8f8f8). base16 holds accents constant across modes, which leaves
# them washed out on white; these are hue-preserved AA (>=4.5) variants.
# Dark theme (default-dark) keeps the canonical base16 values. red/brown already
# passed and are unchanged. nvim inherits these via ctermfg (notermguicolors).
background = f8f8f8
foreground = 383838
selection-background = d8d8d8
selection-foreground = f8f8f8
palette = 0=#f8f8f8
palette = 1=#ab4642
palette = 2=#66763b
palette = 3=#9e620b
palette = 4=#41788c
palette = 5=#9c5d8d
palette = 6=#3e7a72
palette = 7=#383838
palette = 8=#b8b8b8
palette = 9=#ab4642
palette = 10=#66763b
palette = 11=#9e620b
palette = 12=#41788c
palette = 13=#9c5d8d
palette = 14=#3e7a72
palette = 15=#181818
palette = 16=#a56122
palette = 17=#a16946
palette = 18=#e8e8e8
palette = 19=#d8d8d8
palette = 20=#585858
palette = 21=#282828

View File

@@ -18,8 +18,10 @@ palette = 5=#b07878
palette = 6=#80a090
palette = 7=#d8d0c0
# Bright colors (same as normal — Ember's muted philosophy)
palette = 8=#4f4e4c
# Bright colors (mostly mirror normals — Ember's muted philosophy)
# EXCEPT slot 8: repurposed as a subtle "panel" bg tint, used by nvim
# folds and any consumer that wants 'just barely off from bg'.
palette = 8=#26241f
palette = 9=#e08060
palette = 10=#8a9868
palette = 11=#c8b468

View File

@@ -10,20 +10,22 @@ selection-foreground = #282418
# Normal colors (accents_light from palette.json)
palette = 0=#282418
palette = 1=#b84c30
palette = 2=#4a6830
palette = 3=#7a6820
palette = 4=#3a6080
palette = 5=#905050
palette = 6=#386858
palette = 1=#9a3a1c
palette = 2=#3e5826
palette = 3=#5e5018
palette = 4=#2c4c68
palette = 5=#743838
palette = 6=#2c5446
palette = 7=#282418
# Bright colors (same as normal — Ember's muted philosophy)
palette = 8=#282418
palette = 9=#b84c30
palette = 10=#4a6830
palette = 11=#7a6820
palette = 12=#3a6080
palette = 13=#905050
palette = 14=#386858
# Bright colors (mostly mirror normals — Ember's muted philosophy)
# EXCEPT slot 8: repurposed as a subtle "panel" bg tint, used by nvim
# folds and any consumer that wants 'just barely off from bg'.
palette = 8=#dccfb6
palette = 9=#9a3a1c
palette = 10=#3e5826
palette = 11=#5e5018
palette = 12=#2c4c68
palette = 13=#743838
palette = 14=#2c5446
palette = 15=#282418

View File

@@ -0,0 +1,31 @@
# Scheme: Mono Dark
# Two-color monochrome variant of default-dark: same bg, fg replaces every
# text color. Slot 0 stays bg (TUIs use it as a background color).
background = 181818
foreground = d8d8d8
selection-background = d8d8d8
selection-foreground = 181818
palette = 0=#181818
palette = 1=#d8d8d8
palette = 2=#d8d8d8
palette = 3=#d8d8d8
palette = 4=#d8d8d8
palette = 5=#d8d8d8
palette = 6=#d8d8d8
palette = 7=#d8d8d8
palette = 8=#d8d8d8
palette = 9=#d8d8d8
palette = 10=#d8d8d8
palette = 11=#d8d8d8
palette = 12=#d8d8d8
palette = 13=#d8d8d8
palette = 14=#d8d8d8
palette = 15=#d8d8d8
palette = 16=#d8d8d8
palette = 17=#d8d8d8
palette = 18=#d8d8d8
palette = 19=#d8d8d8
palette = 20=#d8d8d8
palette = 21=#d8d8d8

View File

@@ -0,0 +1,31 @@
# Scheme: Mono Light
# Two-color monochrome variant of default-light: same bg, fg replaces every
# text color. Slot 0 stays bg (TUIs use it as a background color).
background = eeeeee
foreground = 383838
selection-background = 383838
selection-foreground = f8f8f8
palette = 0=#f8f8f8
palette = 1=#383838
palette = 2=#383838
palette = 3=#383838
palette = 4=#383838
palette = 5=#383838
palette = 6=#383838
palette = 7=#383838
palette = 8=#383838
palette = 9=#383838
palette = 10=#383838
palette = 11=#383838
palette = 12=#383838
palette = 13=#383838
palette = 14=#383838
palette = 15=#383838
palette = 16=#383838
palette = 17=#383838
palette = 18=#383838
palette = 19=#383838
palette = 20=#383838
palette = 21=#383838

View File

@@ -4,11 +4,15 @@ k9s:
active: cp1-ns
lockFavorites: false
favorites:
- matt-dp
- kube-public
- cert-manager
- cp-automation-dp
- all
- cp1-ns
- default
view:
active: po
active: v1/namespaces
featureGates:
nodeShell: false
portForwardAddress: localhost
proxy: null

View File

@@ -0,0 +1,4 @@
benchmarks:
defaults:
concurrency: 2
requests: 200

View File

@@ -0,0 +1,14 @@
k9s:
cluster: microk8s-cluster
namespace:
active: nperf15-241024
lockFavorites: false
favorites:
- nperf15-241024
- default
view:
active: po
featureGates:
nodeShell: false
portForwardAddress: localhost
proxy: null

View File

@@ -13,7 +13,7 @@ k9s:
reactive: false
noIcons: false
defaultsToFullScreen: false
skin: onedark
skin: default-light
skipLatestRevCheck: false
disablePodCounting: false
shellPod:

View File

@@ -3,12 +3,12 @@
appearance=$(defaults read -g AppleInterfaceStyle 2>/dev/null)
if [[ "$appearance" = "Dark" ]]; then
skin="onedark"
skin="default-dark"
else
skin="onelight"
skin="default-light"
fi
config_file="$HOME/dotfiles/k9s/.config/k9s/config.yaml"
config_file="$HOME/doc/dev/dotfiles/k9s/.config/k9s/config.yaml"
if [[ -f "$config_file" ]]; then
sed -i '' "s/skin: .*/skin: $skin/" "$config_file"

View File

@@ -0,0 +1,114 @@
# Default Dark — base16 default dark k9s skin
# Colors hardcoded from ghostty default-dark theme (base16 default).
# Backgrounds are explicit (not transparent) so k9s renders consistently
# regardless of terminal theme handling.
foreground: &foreground "#d8d8d8"
background: &background "#181818"
black: &black "#181818"
blue: &blue "#7cafc2"
green: &green "#a1b56c"
grey: &grey "#585858"
orange: &orange "#dc9656"
purple: &purple "#ba8baf"
red: &red "#ab4642"
yellow: &yellow "#f7ca88"
cyan: &cyan "#86c1b9"
k9s:
body:
fgColor: *foreground
bgColor: *background
logoColor: *green
prompt:
fgColor: *foreground
bgColor: *background
suggestColor: *orange
info:
fgColor: *foreground
sectionColor: *green
help:
fgColor: *foreground
bgColor: *background
keyColor: *yellow
numKeyColor: *blue
sectionColor: *purple
dialog:
fgColor: *foreground
bgColor: *background
buttonFgColor: *background
buttonBgColor: *green
buttonFocusFgColor: *background
buttonFocusBgColor: *blue
labelFgColor: *orange
fieldFgColor: *blue
frame:
border:
fgColor: *grey
focusColor: *blue
menu:
fgColor: *foreground
keyColor: *yellow
numKeyColor: *yellow
crumbs:
fgColor: *background
bgColor: *green
activeColor: *yellow
status:
newColor: *blue
modifyColor: *green
addColor: *foreground
pendingColor: *orange
errorColor: *red
highlightColor: *yellow
killColor: *purple
completedColor: *grey
title:
fgColor: *blue
bgColor: *background
highlightColor: *purple
counterColor: *foreground
filterColor: *blue
views:
charts:
bgColor: *background
defaultDialColors:
- *green
- *red
defaultChartColors:
- *green
- *red
table:
fgColor: *foreground
bgColor: *background
cursorFgColor: *background
cursorBgColor: *blue
markColor: *orange
header:
fgColor: *foreground
bgColor: *background
sorterColor: *orange
selectedSortColumnColor: *foreground
xray:
fgColor: *foreground
bgColor: *background
cursorColor: *blue
graphicColor: *orange
showIcons: false
yaml:
keyColor: *blue
colonColor: *grey
valueColor: *foreground
logs:
fgColor: *foreground
bgColor: *background
indicator:
fgColor: *blue
bgColor: *background
toggleOnColor: *green
toggleOffColor: *grey
help:
fgColor: *foreground
bgColor: *background
indicator:
fgColor: *blue

View File

@@ -0,0 +1,115 @@
# Default Light — base16 default light (contrast-modified) k9s skin
# Colors hardcoded from ghostty default-light theme. Accents are the
# hue-preserved WCAG AA variants darkened for the #f8f8f8 background.
# Backgrounds are explicit (not transparent) so k9s renders consistently
# regardless of terminal theme handling.
foreground: &foreground "#383838"
background: &background "#f8f8f8"
white: &white "#f8f8f8"
blue: &blue "#41788c"
green: &green "#66763b"
grey: &grey "#585858"
orange: &orange "#a56122"
purple: &purple "#9c5d8d"
red: &red "#ab4642"
yellow: &yellow "#9e620b"
cyan: &cyan "#3e7a72"
k9s:
body:
fgColor: *foreground
bgColor: *background
logoColor: *green
prompt:
fgColor: *foreground
bgColor: *background
suggestColor: *orange
info:
fgColor: *foreground
sectionColor: *green
help:
fgColor: *foreground
bgColor: *background
keyColor: *yellow
numKeyColor: *blue
sectionColor: *purple
dialog:
fgColor: *foreground
bgColor: *background
buttonFgColor: *white
buttonBgColor: *green
buttonFocusFgColor: *white
buttonFocusBgColor: *blue
labelFgColor: *orange
fieldFgColor: *blue
frame:
border:
fgColor: *grey
focusColor: *blue
menu:
fgColor: *foreground
keyColor: *yellow
numKeyColor: *yellow
crumbs:
fgColor: *white
bgColor: *green
activeColor: *yellow
status:
newColor: *blue
modifyColor: *green
addColor: *foreground
pendingColor: *orange
errorColor: *red
highlightColor: *yellow
killColor: *purple
completedColor: *grey
title:
fgColor: *blue
bgColor: *background
highlightColor: *purple
counterColor: *foreground
filterColor: *blue
views:
charts:
bgColor: *background
defaultDialColors:
- *green
- *red
defaultChartColors:
- *green
- *red
table:
fgColor: *foreground
bgColor: *background
cursorFgColor: *white
cursorBgColor: *blue
markColor: *orange
header:
fgColor: *foreground
bgColor: *background
sorterColor: *orange
selectedSortColumnColor: *foreground
xray:
fgColor: *foreground
bgColor: *background
cursorColor: *blue
graphicColor: *orange
showIcons: false
yaml:
keyColor: *blue
colonColor: *grey
valueColor: *foreground
logs:
fgColor: *foreground
bgColor: *background
indicator:
fgColor: *blue
bgColor: *background
toggleOnColor: *green
toggleOffColor: *grey
help:
fgColor: *foreground
bgColor: *background
indicator:
fgColor: *blue

View File

@@ -0,0 +1,111 @@
# Ember Light — warm ivory variant k9s skin
# Colors derived from ghostty ember-light theme
foreground: &foreground "#282418"
background: &background "#e6dac4"
black: &black "#282418"
blue: &blue "#3a6080"
green: &green "#4a6830"
grey: &grey "#282418"
orange: &orange "#b84c30"
purple: &purple "#905050"
red: &red "#b84c30"
yellow: &yellow "#7a6820"
cyan: &cyan "#386858"
k9s:
body:
fgColor: *foreground
bgColor: *background
logoColor: *green
prompt:
fgColor: *foreground
bgColor: *background
suggestColor: *orange
info:
fgColor: *grey
sectionColor: *green
help:
fgColor: *foreground
bgColor: *background
keyColor: *yellow
numKeyColor: *blue
sectionColor: *purple
dialog:
fgColor: *black
bgColor: *background
buttonFgColor: *foreground
buttonBgColor: *green
buttonFocusFgColor: *black
buttonFocusBgColor: *blue
labelFgColor: *orange
fieldFgColor: *blue
frame:
border:
fgColor: *foreground
focusColor: *blue
menu:
fgColor: *grey
keyColor: *yellow
numKeyColor: *yellow
crumbs:
fgColor: *background
bgColor: *green
activeColor: *yellow
status:
newColor: *blue
modifyColor: *green
addColor: *grey
pendingColor: *orange
errorColor: *red
highlightColor: *yellow
killColor: *purple
completedColor: *grey
title:
fgColor: *blue
bgColor: *background
highlightColor: *purple
counterColor: *foreground
filterColor: *blue
views:
charts:
bgColor: *background
defaultDialColors:
- *green
- *red
defaultChartColors:
- *green
- *red
table:
fgColor: *yellow
bgColor: *background
cursorFgColor: *background
cursorBgColor: *blue
markColor: *yellow
header:
fgColor: *grey
bgColor: *background
sorterColor: *orange
xray:
fgColor: *blue
bgColor: *background
cursorColor: *foreground
graphicColor: *yellow
showIcons: false
yaml:
keyColor: *red
colonColor: *grey
valueColor: *grey
logs:
fgColor: *grey
bgColor: *background
indicator:
fgColor: *blue
bgColor: *background
toggleOnColor: *red
toggleOffColor: *grey
help:
fgColor: *grey
bgColor: *background
indicator:
fgColor: *blue

View File

@@ -0,0 +1,111 @@
# Ember — dark variant k9s skin
# Colors derived from ghostty ember theme
foreground: &foreground "#d8d0c0"
background: &background "transparent"
black: &black "#1c1b19"
blue: &blue "#7890a0"
green: &green "#8a9868"
grey: &grey "#d8d0c0"
orange: &orange "#e08060"
purple: &purple "#b07878"
red: &red "#e08060"
yellow: &yellow "#c8b468"
cyan: &cyan "#80a090"
k9s:
body:
fgColor: *foreground
bgColor: *background
logoColor: *green
prompt:
fgColor: *foreground
bgColor: *background
suggestColor: *orange
info:
fgColor: *grey
sectionColor: *green
help:
fgColor: *foreground
bgColor: *background
keyColor: *yellow
numKeyColor: *blue
sectionColor: *purple
dialog:
fgColor: *black
bgColor: *background
buttonFgColor: *foreground
buttonBgColor: *green
buttonFocusFgColor: *black
buttonFocusBgColor: *blue
labelFgColor: *orange
fieldFgColor: *blue
frame:
border:
fgColor: *green
focusColor: *blue
menu:
fgColor: *grey
keyColor: *yellow
numKeyColor: *yellow
crumbs:
fgColor: *black
bgColor: *green
activeColor: *yellow
status:
newColor: *blue
modifyColor: *green
addColor: *grey
pendingColor: *orange
errorColor: *red
highlightColor: *yellow
killColor: *purple
completedColor: *grey
title:
fgColor: *blue
bgColor: *background
highlightColor: *purple
counterColor: *foreground
filterColor: *blue
views:
charts:
bgColor: *background
defaultDialColors:
- *green
- *red
defaultChartColors:
- *green
- *red
table:
fgColor: *yellow
bgColor: *background
cursorFgColor: *black
cursorBgColor: *blue
markColor: *orange
header:
fgColor: *grey
bgColor: *background
sorterColor: *orange
xray:
fgColor: *blue
bgColor: *background
cursorColor: *foreground
graphicColor: *orange
showIcons: false
yaml:
keyColor: *red
colonColor: *grey
valueColor: *grey
logs:
fgColor: *grey
bgColor: *background
indicator:
fgColor: *blue
bgColor: *background
toggleOnColor: *red
toggleOffColor: *grey
help:
fgColor: *grey
bgColor: *background
indicator:
fgColor: *blue

View File

@@ -1,15 +1,14 @@
{
"LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" },
"auto-dark-mode.nvim": { "branch": "main", "commit": "54058b4fe414bd64bd2904a6f8a63f1f14e3d8df" },
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
"formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" },
"gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
"helm-ls.nvim": { "branch": "main", "commit": "f0b9a1723890971a6d84890b50dbf5f40974ea1b" },
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
"leetcode.nvim": { "branch": "master", "commit": "fdd3f91800b3983e27bc9fcfb99cfa7293d7f11a" },
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
"nnn.nvim": { "branch": "master", "commit": "efe690293eee87558f034a83ed96157e52639cdb" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim": { "branch": "main", "commit": "7365b8dede43a82ed1df741275b75333422e5402" },
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
"nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
"nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" },
@@ -18,10 +17,10 @@
"nvim-lspconfig": { "branch": "master", "commit": "0203a9608d63eda57679b01e69f33a7b4c34b0d1" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-tree.lua": { "branch": "master", "commit": "9197f3ee3f0c9a754aab5b16500db6d7da5f68fd" },
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"orgmode": { "branch": "master", "commit": "9deee54eb3dfc0fc2aebb3346c317ed198f423cb" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
"tree-sitter-manager.nvim": { "branch": "main", "commit": "48396293d84a8dd88b857f298ee5953fa3572e5f" },
"zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" }
}

View File

@@ -28,11 +28,10 @@ require('lazy').setup({
'rcarriga/nvim-dap-ui',
'nvim-neotest/nvim-nio',
'leoluz/nvim-dap-go',
'romus204/tree-sitter-manager.nvim',
'nvim-treesitter/nvim-treesitter',
'luukvbaal/nnn.nvim',
'nvim-tree/nvim-tree.lua',
'lewis6991/gitsigns.nvim',
'mhartington/formatter.nvim',
{
'folke/zen-mode.nvim',
opts = {
@@ -48,21 +47,6 @@ require('lazy').setup({
},
}
},
-- {
-- "CopilotC-Nvim/CopilotChat.nvim",
-- dependencies = {
-- { "github/copilot.vim" }, -- or zbirenbaum/copilot.lua
-- },
-- build = "make tiktoken", -- Only on MacOS or Linux
-- opts = {
-- window = {
-- layout = 'replace',
-- },
-- mappings = {
-- accept_diff = false, -- disables the default <C-y> “accept nearest diff”
-- },
-- },
-- },
-- Utility
'windwp/nvim-autopairs',
'nvim-telescope/telescope.nvim',
@@ -81,15 +65,6 @@ require('lazy').setup({
org_startup_indented = true,
org_deadline_warning_days = 0,
org_agenda_custom_commands = {
w = {
description = "Work",
types = {
{
type = 'agenda',
org_agenda_tag_filter_preset = 'work'
}
}
},
p = {
description = "Personal",
types = {
@@ -99,28 +74,43 @@ require('lazy').setup({
}
}
},
w = {
description = "Work",
types = {
{
type = 'agenda',
org_agenda_tag_filter_preset = 'work'
}
}
},
m = {
description = "Milestones",
types = {
{
type = 'agenda',
org_agenda_tag_filter_preset = 'milestone'
}
}
},
s = {
description = "Social",
types = {
{
type = 'agenda',
org_agenda_tag_filter_preset = 'social'
}
}
},
}
})
end,
},
-- Study
{
"kawre/leetcode.nvim",
dependencies = {
-- include a picker of your choice, see picker section for more details
"nvim-lua/plenary.nvim",
"MunifTanjim/nui.nvim",
},
opts = {
lang = "python3"
},
}
})
-- Initialize Plugins
require("mason").setup()
require('neodev').setup()
require("tree-sitter-manager").setup()
-- require("tree-sitter-manager").setup()
require('nnn').setup({
picker = {
cmd = "nnn -C",
@@ -137,6 +127,9 @@ local function tree_on_attach(bufnr)
end
require('nvim-tree').setup({
on_attach = tree_on_attach,
renderer = {
full_name = true,
},
view = {
side = "left",
},
@@ -147,20 +140,6 @@ require('nvim-tree').setup({
},
},
})
-- require('gitsigns').setup()
require('formatter').setup({
filetype = {
python = {
function()
return {
exe = "black",
args = { "--quiet", "-" },
stdin = true
}
end
}
}
})
require('telescope').setup({
defaults = {
file_ignore_patterns = {

View File

@@ -10,17 +10,6 @@ vim.wo.number = true
vim.wo.relativenumber = true
vim.g.mapleader = ' '
vim.o.splitright = true
-- vim.o.scrolloff = 999
-- vim.o.clipboard="unnamedplus"
vim.api.nvim_create_autocmd("FileType", {
pattern = "markdown",
command = "setlocal wrap linebreak",
})
vim.api.nvim_create_autocmd("FileType", {
pattern = "org",
command = "setlocal shiftwidth=2 tabstop=2 expandtab",
})
-- Highlighting for orgmode files with highlight.nvim
vim.api.nvim_create_autocmd("ColorScheme", {
@@ -37,7 +26,6 @@ vim.api.nvim_create_autocmd("ColorScheme", {
})
-- Global colorscheme based on terminal colors
-- vim.cmd("Copilot disable")
vim.cmd([[
autocmd ColorScheme * highlight Statement cterm=bold ctermfg=5
autocmd ColorScheme * highlight Keyword ctermfg=5
@@ -46,8 +34,10 @@ vim.cmd([[
autocmd ColorScheme * highlight Constant ctermfg=3
autocmd ColorScheme * highlight String ctermfg=2
autocmd ColorScheme * highlight Comment cterm=italic ctermfg=lightgray
autocmd ColorScheme * highlight Visual cterm=reverse ctermfg=NONE ctermbg=NONE
syntax on
set notermguicolors
colorscheme default
]])
-- autocmd ColorScheme * highlight Folded cterm=italic ctermfg=lightgray ctermbg=18

View File

@@ -1,3 +1,11 @@
{
"$schema": "https://opencode.ai/config.json"
"$schema": "https://opencode.ai/config.json",
"theme": "base16-default",
"mcp": {
"playwright": {
"type": "local",
"command": ["npx", "@playwright/mcp@latest"],
"enabled": true
}
}
}

View File

@@ -0,0 +1,80 @@
{
"$schema": "https://opencode.ai/theme.json",
"defs": {
"base00": "#181818",
"base01": "#282828",
"base02": "#383838",
"base03": "#585858",
"base04": "#b8b8b8",
"base05": "#d8d8d8",
"base06": "#e8e8e8",
"base07": "#f8f8f8",
"base08": "#86c1b9",
"base09": "#dc9656",
"base0A": "#f7ca88",
"base0B": "#a1b56c",
"base0C": "#ab4642",
"base0D": "#7cafc2",
"base0E": "#ba8baf",
"base0F": "#a16946",
"base09_l": "#a56122",
"base0A_l": "#9e620b",
"base0B_l": "#66763b",
"base08_l": "#3e7a72",
"base0D_l": "#41788c",
"base0E_l": "#9c5d8d"
},
"theme": {
"primary": { "dark": "base0D", "light": "base0D_l" },
"secondary": { "dark": "base0E", "light": "base0E_l" },
"accent": { "dark": "base0F", "light": "base0F" },
"error": { "dark": "base08", "light": "base08_l" },
"warning": { "dark": "base0A", "light": "base0A_l" },
"success": { "dark": "base0B", "light": "base0B_l" },
"info": { "dark": "base0C", "light": "base0C" },
"text": { "dark": "base05", "light": "base02" },
"textMuted": { "dark": "base03", "light": "base04" },
"background": { "dark": "base00", "light": "base07" },
"backgroundPanel": { "dark": "base01", "light": "base06" },
"backgroundElement": { "dark": "base02", "light": "base05" },
"border": { "dark": "base03", "light": "base04" },
"borderActive": { "dark": "base04", "light": "base03" },
"borderSubtle": { "dark": "base05", "light": "base02" },
"diffAdded": { "dark": "base0B", "light": "base0B_l" },
"diffRemoved": { "dark": "base08", "light": "base08_l" },
"diffContext": { "dark": "base03", "light": "base04" },
"diffHunkHeader": { "dark": "base09", "light": "base09_l" },
"diffHighlightAdded": { "dark": "base0B", "light": "base0B_l" },
"diffHighlightRemoved": { "dark": "base08", "light": "base08_l" },
"diffAddedBg": { "dark": "base01", "light": "base06" },
"diffRemovedBg": { "dark": "base01", "light": "base06" },
"diffContextBg": { "dark": "base01", "light": "base06" },
"diffLineNumber": { "dark": "base03", "light": "base04" },
"diffAddedLineNumberBg": { "dark": "base01", "light": "base06" },
"diffRemovedLineNumberBg": { "dark": "base01", "light": "base06" },
"markdownText": { "dark": "base05", "light": "base02" },
"markdownHeading": { "dark": "base0E", "light": "base0E_l" },
"markdownLink": { "dark": "base0D", "light": "base0D_l" },
"markdownLinkText": { "dark": "base0A", "light": "base0A_l" },
"markdownCode": { "dark": "base0B", "light": "base0B_l" },
"markdownBlockQuote": { "dark": "base0A", "light": "base0A_l" },
"markdownEmph": { "dark": "base0A", "light": "base0A_l" },
"markdownStrong": { "dark": "base09", "light": "base09_l" },
"markdownHorizontalRule": { "dark": "base04", "light": "base03" },
"markdownListItem": { "dark": "base0D", "light": "base0D_l" },
"markdownListEnumeration": { "dark": "base0A", "light": "base0A_l" },
"markdownImage": { "dark": "base0D", "light": "base0D_l" },
"markdownImageText": { "dark": "base0A", "light": "base0A_l" },
"markdownCodeBlock": { "dark": "base05", "light": "base02" },
"syntaxComment": { "dark": "base03", "light": "base04" },
"syntaxKeyword": { "dark": "base0E", "light": "base0E_l" },
"syntaxFunction": { "dark": "base0D", "light": "base0D_l" },
"syntaxVariable": { "dark": "base05", "light": "base02" },
"syntaxString": { "dark": "base0B", "light": "base0B_l" },
"syntaxNumber": { "dark": "base09", "light": "base09_l" },
"syntaxType": { "dark": "base0C", "light": "base0C" },
"syntaxOperator": { "dark": "base0A", "light": "base0A_l" },
"syntaxPunctuation": { "dark": "base05", "light": "base02" }
}
}

View File

@@ -0,0 +1,99 @@
{
"$schema": "https://opencode.ai/theme.json",
"defs": {
"_dark_bg": "#1c1b19",
"_dark_bg_panel": "#26241f",
"_dark_bg_element": "#3e3c38",
"_dark_fg": "#d8d0c0",
"_dark_fg_muted": "#8a8780",
"_dark_border": "#3e3c38",
"_dark_border_active": "#4f4e4c",
"_dark_border_subtle": "#2a2926",
"_dark_gray": "#4f4e4c",
"_dark_red": "#e08060",
"_dark_green": "#8a9868",
"_dark_yellow": "#c8b468",
"_dark_blue": "#7890a0",
"_dark_magenta": "#b07878",
"_dark_cyan": "#80a090",
"_dark_white": "#d8d0c0",
"_dark_diff_added_bg": "#2a3326",
"_dark_diff_removed_bg": "#3a2620",
"_light_bg": "#e6dac4",
"_light_bg_panel": "#dccfb6",
"_light_bg_element": "#c8bca6",
"_light_fg": "#282418",
"_light_fg_muted": "#5e5848",
"_light_border": "#c8bca6",
"_light_border_active": "#a89c86",
"_light_border_subtle": "#d4c8b0",
"_light_black": "#282418",
"_light_red": "#9a3a1c",
"_light_green": "#3e5826",
"_light_yellow": "#5e5018",
"_light_blue": "#2c4c68",
"_light_magenta": "#743838",
"_light_cyan": "#2c5446",
"_light_diff_added_bg": "#d4dcb8",
"_light_diff_removed_bg": "#e8c8b8"
},
"theme": {
"primary": { "dark": "_dark_red", "light": "_light_red" },
"secondary": { "dark": "_dark_yellow", "light": "_light_yellow" },
"accent": { "dark": "_dark_blue", "light": "_light_blue" },
"error": { "dark": "_dark_red", "light": "_light_red" },
"warning": { "dark": "_dark_yellow", "light": "_light_yellow" },
"success": { "dark": "_dark_green", "light": "_light_green" },
"info": { "dark": "_dark_cyan", "light": "_light_cyan" },
"text": { "dark": "_dark_fg", "light": "_light_fg" },
"textMuted": { "dark": "_dark_fg_muted", "light": "_light_fg_muted" },
"background": { "dark": "_dark_bg", "light": "_light_bg" },
"backgroundPanel": { "dark": "_dark_bg_panel", "light": "_light_bg_panel" },
"backgroundElement": { "dark": "_dark_bg_element", "light": "_light_bg_element" },
"border": { "dark": "_dark_border", "light": "_light_border" },
"borderActive": { "dark": "_dark_border_active", "light": "_light_border_active" },
"borderSubtle": { "dark": "_dark_border_subtle", "light": "_light_border_subtle" },
"diffAdded": { "dark": "_dark_green", "light": "_light_green" },
"diffRemoved": { "dark": "_dark_red", "light": "_light_red" },
"diffContext": { "dark": "_dark_fg_muted", "light": "_light_fg_muted" },
"diffHunkHeader": { "dark": "_dark_blue", "light": "_light_blue" },
"diffHighlightAdded": { "dark": "_dark_green", "light": "_light_green" },
"diffHighlightRemoved": { "dark": "_dark_red", "light": "_light_red" },
"diffAddedBg": { "dark": "_dark_diff_added_bg", "light": "_light_diff_added_bg" },
"diffRemovedBg": { "dark": "_dark_diff_removed_bg", "light": "_light_diff_removed_bg" },
"diffContextBg": { "dark": "_dark_bg_panel", "light": "_light_bg_panel" },
"diffLineNumber": { "dark": "_dark_gray", "light": "_light_fg_muted" },
"diffAddedLineNumberBg": { "dark": "_dark_diff_added_bg", "light": "_light_diff_added_bg" },
"diffRemovedLineNumberBg": { "dark": "_dark_diff_removed_bg", "light": "_light_diff_removed_bg" },
"markdownText": { "dark": "_dark_fg", "light": "_light_fg" },
"markdownHeading": { "dark": "_dark_red", "light": "_light_red" },
"markdownLink": { "dark": "_dark_blue", "light": "_light_blue" },
"markdownLinkText": { "dark": "_dark_cyan", "light": "_light_cyan" },
"markdownCode": { "dark": "_dark_green", "light": "_light_green" },
"markdownBlockQuote": { "dark": "_dark_fg_muted", "light": "_light_fg_muted" },
"markdownEmph": { "dark": "_dark_yellow", "light": "_light_yellow" },
"markdownStrong": { "dark": "_dark_red", "light": "_light_red" },
"markdownHorizontalRule": { "dark": "_dark_border", "light": "_light_border" },
"markdownListItem": { "dark": "_dark_red", "light": "_light_red" },
"markdownListEnumeration": { "dark": "_dark_yellow", "light": "_light_yellow" },
"markdownImage": { "dark": "_dark_blue", "light": "_light_blue" },
"markdownImageText": { "dark": "_dark_cyan", "light": "_light_cyan" },
"markdownCodeBlock": { "dark": "_dark_fg", "light": "_light_fg" },
"syntaxComment": { "dark": "_dark_gray", "light": "_light_fg_muted" },
"syntaxKeyword": { "dark": "_dark_red", "light": "_light_red" },
"syntaxFunction": { "dark": "_dark_yellow", "light": "_light_yellow" },
"syntaxVariable": { "dark": "_dark_fg", "light": "_light_fg" },
"syntaxString": { "dark": "_dark_green", "light": "_light_green" },
"syntaxNumber": { "dark": "_dark_magenta", "light": "_light_magenta" },
"syntaxType": { "dark": "_dark_blue", "light": "_light_blue" },
"syntaxOperator": { "dark": "_dark_cyan", "light": "_light_cyan" },
"syntaxPunctuation": { "dark": "_dark_fg", "light": "_light_fg" }
}
}

29
swiftbar/org-clock.1m.sh Executable file
View File

@@ -0,0 +1,29 @@
#!/bin/bash
# <xbar.title>Org Clock</xbar.title>
# <xbar.desc>Shows currently clocked org task (fixed open-clock detection)</xbar.desc>
# ←←← CHANGE THIS TO YOUR ACTUAL ORG FOLDER
ORG_DIR="$HOME/doc/org" # e.g. ~/Documents/org or ~/Dropbox/org
if [[ ! -d "$ORG_DIR" ]]; then
echo "⏱ Org folder not found"
exit 0
fi
TASK=$(find "$ORG_DIR" -name "*.org" -type f -print0 2>/dev/null \
| xargs -0 awk '
/^\*+ / { headline = $0 }
/CLOCK: \[/ && !/--/ {
print headline
exit
}
' \
| head -n 1 \
| sed -E 's/^[ \t]*\*+[ \t]*//')
if [[ -n "$TASK" ]]; then
echo "$TASK"
else
echo "⏱ No clock"
fi

View File

@@ -44,7 +44,9 @@ set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl
set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # truecolor underline
set -g status-style "fg=blue"
# set -g window-status-style "dim"
set -g window-status-current-style "fg=blue"
set -g pane-border-style "fg=default,dim"
set -g pane-active-border-style "fg=blue"
setw -g mode-keys vi
@@ -52,18 +54,17 @@ bind -T copy-mode-vi 'v' send -X begin-selection
bind -T copy-mode-vi 'y' send -X copy-pipe-and-cancel "pbcopy"
# set -g status-right "#(date +'%I:%M %p')"
set -g status-right "#(date +'%A, %B %d, %Y')"
# set -g status-right "#(date +'%A, %B %d, %Y')"
set -g status-right ""
# Activate OFF mode
# Activate OFF mode (hide outer status entirely for nested tmux)
bind o \
set prefix None \;\
set key-table off \;\
set status-style "fg=brightblack" \;\
set window-status-current-style "fg=brightblack"
set status off
# Disable OFF mode
bind -T off O \
set -u prefix \;\
set -u key-table \;\
set -u status-style \;\
set -u window-status-current-style
set -u status