Compare commits
3 Commits
b2023a404b
...
08963eef2d
Author | SHA1 | Date |
---|---|---|
Rob Watson | 08963eef2d | |
Rob Watson | b1fd7b3ac6 | |
Rob Watson | e9416932fe |
|
@ -41,8 +41,10 @@
|
||||||
l1 = log --oneline
|
l1 = log --oneline
|
||||||
ll = log --oneline -n 5
|
ll = log --oneline -n 5
|
||||||
lp = log -p
|
lp = log -p
|
||||||
|
lpme = logpme
|
||||||
lm = logme
|
lm = logme
|
||||||
logme = !sh -c 'git log --author=\"$(git config --get user.name)\"'
|
logme = !sh -c 'git log --author=\"$(git config --get user.name)\"'
|
||||||
|
logpme = !sh -c 'git log -p --author=\"$(git config --get user.name)\"'
|
||||||
lrb = !git log $(git drb)
|
lrb = !git log $(git drb)
|
||||||
ls = !git branch --format '%(refname:short)' | fzf
|
ls = !git branch --format '%(refname:short)' | fzf
|
||||||
ma = merge --abort
|
ma = merge --abort
|
||||||
|
|
|
@ -115,4 +115,5 @@ require("nvim-treesitter.configs").setup({
|
||||||
|
|
||||||
require("treesitter-context").setup({
|
require("treesitter-context").setup({
|
||||||
enable = true,
|
enable = true,
|
||||||
|
max_lines = 7
|
||||||
})
|
})
|
||||||
|
|
6
zshenv
6
zshenv
|
@ -30,6 +30,12 @@ export FAST_REFRESH=false
|
||||||
# k8s
|
# k8s
|
||||||
export KUBECONFIG=$HOME/.kube/config:$HOME/.kube/config-do
|
export KUBECONFIG=$HOME/.kube/config:$HOME/.kube/config-do
|
||||||
|
|
||||||
|
if [ "$(uname -s)" = "Darwin" ]; then
|
||||||
|
# brew
|
||||||
|
export HOMEBREW_NO_INSTALL_CLEANUP=1
|
||||||
|
export HOMEBREW_NO_AUTO_UPDATE=1
|
||||||
|
fi
|
||||||
|
|
||||||
# See `installdotfiles`:
|
# See `installdotfiles`:
|
||||||
if [ -f "$ZDOTDIR/.zshsecrets" ]; then
|
if [ -f "$ZDOTDIR/.zshsecrets" ]; then
|
||||||
source "$ZDOTDIR/.zshsecrets"
|
source "$ZDOTDIR/.zshsecrets"
|
||||||
|
|
10
zshrc
10
zshrc
|
@ -166,6 +166,16 @@ export PATH=$HOME/bin:$PATH
|
||||||
export PATH=$HOME/.local/bin:$PATH
|
export PATH=$HOME/.local/bin:$PATH
|
||||||
export PATH=$HOME/script:$PATH
|
export PATH=$HOME/script:$PATH
|
||||||
|
|
||||||
|
if [ "$(uname -s)" = "Darwin" ]; then
|
||||||
|
if [ -d /opt/homebrew/bin ]; then
|
||||||
|
export PATH=/opt/homebrew/bin:$PATH
|
||||||
|
fi
|
||||||
|
if [ -d /opt/homebrew/opt/curl/bin ]; then
|
||||||
|
export PATH="/opt/homebrew/opt/curl/bin:$PATH"
|
||||||
|
fi
|
||||||
|
export PATH="/Applications/Postgres.app/Contents/Versions/16/bin:$PATH"
|
||||||
|
fi
|
||||||
|
|
||||||
export VIMPLUGIN="$HOME/.vim/pack/git-plugins"
|
export VIMPLUGIN="$HOME/.vim/pack/git-plugins"
|
||||||
|
|
||||||
# source local zshrc, if it exists (not: not in git)
|
# source local zshrc, if it exists (not: not in git)
|
||||||
|
|
Loading…
Reference in New Issue