Compare commits
7 Commits
c03ee8019e
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 0b8d1f11bb | |||
| ed139c13a3 | |||
| cd73ea0859 | |||
| d3e5e47c01 | |||
| b44925b2df | |||
|
|
85b8e773ce | ||
| e2521a2df3 |
@@ -19,3 +19,8 @@ lines = 115
|
||||
[window.position]
|
||||
x = 1550
|
||||
y = 0
|
||||
|
||||
[keyboard]
|
||||
bindings = [
|
||||
{ key = "Return", mods = "Shift", chars = "\n" }
|
||||
]
|
||||
|
||||
@@ -1 +1,8 @@
|
||||
font-family = "FiraCode Nerd Font Mono"
|
||||
|
||||
background-opacity = 0.8
|
||||
|
||||
command = "/usr/bin/zsh -c 'tmux attach || tmux'"
|
||||
initial-command = "/usr/bin/zsh -c 'tmux attach || tmux'"
|
||||
|
||||
keybind = shift+enter=text:\n
|
||||
|
||||
@@ -41,6 +41,8 @@ alias cdjb='cd $HOME/src/github.com/jbohanon'
|
||||
alias cdgh='cd $HOME/src/github.com'
|
||||
alias cdo='cd $HOME/Documents/obsidian/work'
|
||||
alias nvo='cdo && nvim .'
|
||||
alias cddd='cd $HOME/src/github.com/AustinRobinson/DrivingDoc'
|
||||
alias nvdd='cddd && nvim .'
|
||||
|
||||
if [[ $(uname) == Linux ]]; then
|
||||
alias pbcopy='xsel --clipboard --input'
|
||||
@@ -74,4 +76,4 @@ alias sz='source $HOME/.zshrc'
|
||||
|
||||
eval "$(starship init zsh)"
|
||||
|
||||
. "$HOME/.local/share/../bin/env"
|
||||
# [[ -f "$HOME/.local/share/../bin/env" ]] && . "$HOME/.local/share/../bin/env"
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
if [[ -f "$HOME/.work-machine" ]]; then
|
||||
|
||||
SOLO_DIR="$HOME/src/github.com/solo-io"
|
||||
SOLO_GITHUB="https://github.com/solo-io"
|
||||
|
||||
@@ -111,3 +113,21 @@ alias nvagwe='cdagwe && nvim_readme'
|
||||
alias cdkgw='cd $KGW_DIR/kgateway'
|
||||
alias nvkgw='cdkgw && nvim_readme'
|
||||
|
||||
alias claude-vertex="CLAUDE_CONFIG_DIR=$HOME/.claude-vertex claude"
|
||||
alias claude-license="CLAUDE_CONFIG_DIR=$HOME/.claude-license claude"
|
||||
|
||||
export CLAUDE_CONFIG_DIR="$HOME/.claude-license"
|
||||
|
||||
function default-claude() {
|
||||
if [[ -z "$1" ]] || ([[ "$1" != "vertex" ]] && [[ "$1" != "license" ]]); then
|
||||
echo "invalid arg; must be 'vertex' or 'license'"
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ "$1" == "vertex" ]]; then
|
||||
export CLAUDE_CONFIG_DIR="$HOME/.claude-vertex"
|
||||
elif [[ "$1" == "license" ]]; then
|
||||
export CLAUDE_CONFIG_DIR="$HOME/.claude-license"
|
||||
fi
|
||||
}
|
||||
fi
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/bash -e
|
||||
branch=$(git status|head -1|cut -f3 -d\ )
|
||||
git checkout main
|
||||
git checkout $(git_main_branch)
|
||||
git pull
|
||||
git checkout "$branch"
|
||||
git merge main
|
||||
git merge $(git_main_branch)
|
||||
|
||||
Reference in New Issue
Block a user