Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 0 additions & 107 deletions .tmux.conf

This file was deleted.

10 changes: 0 additions & 10 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@ fpath=(
${fpath}
)

tpop() {
local session_name=claude
tmux has-session -t "$session_name" 2>/dev/null
if [ $? -eq 0 ]; then
tmux popup tmux attach -t "$session_name"
else
tmux popup tmux new -s "$session_name"
fi
}

_kubectl_lazy_completion() {
unfunction kubectl 2>/dev/null
[[ $commands[kubectl] ]] && source <(command kubectl completion zsh)
Expand Down
1 change: 1 addition & 0 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ brew "fd"
brew "fzf"
brew "git-delta"
brew "htop"
brew "herdr"
brew "neovim"
brew "plantuml"
brew "ripgrep"
Expand Down
43 changes: 43 additions & 0 deletions herdr/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
onboarding = false

[theme]
name = "catppuccin"

[terminal]
shell_mode = "auto"
new_cwd = "follow"

[keys]
prefix = "ctrl+b"
reload_config = "prefix+shift+r"
workspace_picker = "prefix+w"
goto = "prefix+g"
new_tab = "prefix+c"
previous_tab = "prefix+p"
next_tab = "prefix+n"
switch_tab = "prefix+1..9"
focus_pane_left = "prefix+h"
focus_pane_down = "prefix+j"
focus_pane_up = "prefix+k"
focus_pane_right = "prefix+l"
split_vertical = ["prefix+v", "prefix+|"]
split_horizontal = "prefix+minus"
close_pane = "prefix+x"
zoom = "prefix+z"
resize_mode = "prefix+r"

[[keys.command]]
key = "ctrl+q"
type = "popup"
command = "exec codex"
description = "open Codex"
width = "80%"
height = "80%"

[[keys.command]]
key = "prefix+t"
type = "popup"
command = "exec nvim ~/Documents/Note/Kanban/work.md"
description = "open todo list"
width = "90%"
height = "90%"
10 changes: 5 additions & 5 deletions iterm2/com.googlecode.iterm2.plist
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
<key>Idle Code</key>
<integer>0</integer>
<key>Initial Text</key>
<string>tmux</string>
<string>herdr</string>
<key>Jobs to Ignore</key>
<array>
<string>rlogin</string>
Expand Down Expand Up @@ -1143,7 +1143,7 @@
<key>Idle Code</key>
<integer>0</integer>
<key>Initial Text</key>
<string>tmux</string>
<string>herdr</string>
<key>Initial Use Transparency</key>
<true/>
<key>Jobs to Ignore</key>
Expand Down Expand Up @@ -1877,7 +1877,7 @@
<key>Idle Code</key>
<integer>0</integer>
<key>Initial Text</key>
<string>tmux</string>
<string>herdr</string>
<key>Jobs to Ignore</key>
<array>
<string>rlogin</string>
Expand Down Expand Up @@ -2918,7 +2918,7 @@
<key>Mouse Reporting</key>
<true/>
<key>Name</key>
<string>tmux</string>
<string>herdr</string>
<key>Non Ascii Font</key>
<string>Monaco 12</string>
<key>Non-ASCII Anti Aliased</key>
Expand Down Expand Up @@ -3373,7 +3373,7 @@
<key>Idle Code</key>
<integer>0</integer>
<key>Initial Text</key>
<string>tmux</string>
<string>herdr</string>
<key>Instant Replay</key>
<false/>
<key>Jobs to Ignore</key>
Expand Down
27 changes: 13 additions & 14 deletions script/link.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,29 @@ for dotfile in "${DOTFILES_DIR}"/.??*; do
ln -fnsv "$dotfile" "$HOME"
done

NVIM_CONFIG_DIR="$HOME/.config/nvim"
mkdir -p "$NVIM_CONFIG_DIR"

legacy_nvim_init="$NVIM_CONFIG_DIR/init.vim"
if [ -L "$legacy_nvim_init" ] && [ "$(readlink "$legacy_nvim_init")" = "$DOTFILES_DIR/nvim/init.vim" ]; then
rm "$legacy_nvim_init"
fi

link_nvim_path() {
link_config_path() {
local source_path=$1
local destination_path=$2

if [ -e "$destination_path" ] && [ ! -L "$destination_path" ]; then
echo "Error: refusing to replace existing Neovim path: $destination_path" >&2
echo "Error: refusing to replace existing config path: $destination_path" >&2
exit 1
fi

ln -fnsv "$source_path" "$destination_path"
}

link_nvim_path "$DOTFILES_DIR/nvim/init.lua" "$NVIM_CONFIG_DIR/init.lua"
link_nvim_path "$DOTFILES_DIR/nvim/lua" "$NVIM_CONFIG_DIR/lua"
link_nvim_path "$DOTFILES_DIR/nvim/lazy-lock.json" "$NVIM_CONFIG_DIR/lazy-lock.json"
link_nvim_path "$DOTFILES_DIR/nvim/.stylua.toml" "$NVIM_CONFIG_DIR/.stylua.toml"
NVIM_CONFIG_DIR="$HOME/.config/nvim"
mkdir -p "$NVIM_CONFIG_DIR"

link_config_path "$DOTFILES_DIR/nvim/init.lua" "$NVIM_CONFIG_DIR/init.lua"
link_config_path "$DOTFILES_DIR/nvim/lua" "$NVIM_CONFIG_DIR/lua"
link_config_path "$DOTFILES_DIR/nvim/lazy-lock.json" "$NVIM_CONFIG_DIR/lazy-lock.json"
link_config_path "$DOTFILES_DIR/nvim/.stylua.toml" "$NVIM_CONFIG_DIR/.stylua.toml"

HERDR_CONFIG_DIR="$HOME/.config/herdr"
mkdir -p "$HERDR_CONFIG_DIR"
link_config_path "$DOTFILES_DIR/herdr/config.toml" "$HERDR_CONFIG_DIR/config.toml"

if [ ! -e "$HOME/.config/karabiner/karabiner.json" ]; then
mkdir -p "$HOME/.config/karabiner/" && touch "$HOME/.config/karabiner/karabiner.json"
Expand Down