diff --git a/bash/.bashrc b/bash/.bashrc index c29a424..103f893 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -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 @@ -197,10 +197,3 @@ alias kc=kubecolor # source <(kubectl completion bash) 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" diff --git a/ghostty/.config/ghostty/config b/ghostty/.config/ghostty/config index 36d3c45..639caab 100644 --- a/ghostty/.config/ghostty/config +++ b/ghostty/.config/ghostty/config @@ -19,7 +19,7 @@ cursor-style = block # background-image = ~/.config/ghostty/earth.png # background-image-opacity = 0 # background-image-fit = cover -window-decoration = false +window-decoration = none macos-icon = xray diff --git a/k9s/.config/k9s/clusters/kubernetes/kubernetes-admin@kubernetes/config.yaml b/k9s/.config/k9s/clusters/kubernetes/kubernetes-admin@kubernetes/config.yaml index 1702c0b..a4e0873 100644 --- a/k9s/.config/k9s/clusters/kubernetes/kubernetes-admin@kubernetes/config.yaml +++ b/k9s/.config/k9s/clusters/kubernetes/kubernetes-admin@kubernetes/config.yaml @@ -4,10 +4,11 @@ k9s: active: cp1-ns lockFavorites: false favorites: + - all - cp1-ns - default view: - active: po + active: namespace featureGates: nodeShell: false portForwardAddress: localhost diff --git a/k9s/.config/k9s/clusters/microk8s-cluster/microk8s/benchmarks.yaml b/k9s/.config/k9s/clusters/microk8s-cluster/microk8s/benchmarks.yaml new file mode 100644 index 0000000..9efba4c --- /dev/null +++ b/k9s/.config/k9s/clusters/microk8s-cluster/microk8s/benchmarks.yaml @@ -0,0 +1,4 @@ +benchmarks: + defaults: + concurrency: 2 + requests: 200 \ No newline at end of file diff --git a/k9s/.config/k9s/clusters/microk8s-cluster/microk8s/config.yaml b/k9s/.config/k9s/clusters/microk8s-cluster/microk8s/config.yaml new file mode 100644 index 0000000..2669c39 --- /dev/null +++ b/k9s/.config/k9s/clusters/microk8s-cluster/microk8s/config.yaml @@ -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 diff --git a/k9s/.config/k9s/config.yaml b/k9s/.config/k9s/config.yaml index 830786f..1aa5df1 100644 --- a/k9s/.config/k9s/config.yaml +++ b/k9s/.config/k9s/config.yaml @@ -13,7 +13,7 @@ k9s: reactive: false noIcons: false defaultsToFullScreen: false - skin: onedark + skin: ember skipLatestRevCheck: false disablePodCounting: false shellPod: diff --git a/k9s/.config/k9s/k9s-theme-sync.sh b/k9s/.config/k9s/k9s-theme-sync.sh index 058c454..8dc9b10 100755 --- a/k9s/.config/k9s/k9s-theme-sync.sh +++ b/k9s/.config/k9s/k9s-theme-sync.sh @@ -3,9 +3,9 @@ appearance=$(defaults read -g AppleInterfaceStyle 2>/dev/null) if [[ "$appearance" = "Dark" ]]; then - skin="onedark" + skin="ember" else - skin="onelight" + skin="ember-light" fi config_file="$HOME/dotfiles/k9s/.config/k9s/config.yaml" diff --git a/k9s/.config/k9s/skins/ember-light.yaml b/k9s/.config/k9s/skins/ember-light.yaml new file mode 100644 index 0000000..8728536 --- /dev/null +++ b/k9s/.config/k9s/skins/ember-light.yaml @@ -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 diff --git a/k9s/.config/k9s/skins/ember.yaml b/k9s/.config/k9s/skins/ember.yaml new file mode 100644 index 0000000..e9138c7 --- /dev/null +++ b/k9s/.config/k9s/skins/ember.yaml @@ -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 diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 8d0ba6b..2f27700 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -103,18 +103,6 @@ require('lazy').setup({ }) 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 @@ -137,6 +125,9 @@ local function tree_on_attach(bufnr) end require('nvim-tree').setup({ on_attach = tree_on_attach, + renderer = { + full_name = true, + }, view = { side = "left", }, diff --git a/swiftbar/org-clock.1m.sh b/swiftbar/org-clock.1m.sh new file mode 100755 index 0000000..766f76e --- /dev/null +++ b/swiftbar/org-clock.1m.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# Org Clock +# Shows currently clocked org task (fixed open-clock detection) + +# ←←← 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