Compare commits
No commits in common. "845bd624edff81c8cab43f8d62457a22205ef332" and "e633ef0e5c8b1e8b79e38a04028f495d0ccaefd2" have entirely different histories.
845bd624ed
...
e633ef0e5c
36
.bashrc
36
.bashrc
@ -1,6 +1,6 @@
|
|||||||
# Navigation
|
# Navigation
|
||||||
alias lg="lazygit"
|
alias lg="lazygit"
|
||||||
alias ls="eza --long --header --git --group --time-style long-iso"
|
alias ls="exa --long --header --git --group"
|
||||||
alias cat="bat --theme=\"Visual Studio Dark+\""
|
alias cat="bat --theme=\"Visual Studio Dark+\""
|
||||||
alias tree="exa --tree"
|
alias tree="exa --tree"
|
||||||
alias la="ls -lhA"
|
alias la="ls -lhA"
|
||||||
@ -152,11 +152,41 @@ git_prompt () {
|
|||||||
|
|
||||||
git_branch=$(git branch 2>/dev/null| sed -n '/^\*/s/^\* //p')
|
git_branch=$(git branch 2>/dev/null| sed -n '/^\*/s/^\* //p')
|
||||||
|
|
||||||
echo " -- $git_branch"
|
if git diff --quiet 2>/dev/null >&2; then
|
||||||
|
git_color="${c_git_clean}"
|
||||||
|
else
|
||||||
|
git_color=${c_git_cleanit_dirty}
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo " -- $git_color$git_branch${c_reset}"
|
||||||
|
}
|
||||||
|
|
||||||
|
kubectl_context() {
|
||||||
|
if [ ! $(which kubectl) ]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
kubectl cluster-info > /dev/null 2>&1
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
context=$(kubectl config current-context 2>/dev/null)
|
||||||
|
namespace=$(kubectl config view -o "jsonpath={.contexts[?(@.name==\"$context\")].context.namespace}")
|
||||||
|
cluster=$(kubectl config view -o "jsonpath={.contexts[?(@.name==\"$context\")].context.cluster}")
|
||||||
|
|
||||||
|
prod_color=`tput setaf 1; tput bold`
|
||||||
|
dev_color=`tput setaf 4; tput bold`
|
||||||
|
|
||||||
|
if [[ "$EKS_CLUSTER_NAME" = "tgrosinger-he-extrahop-com" ]]; then
|
||||||
|
echo "-- ${dev_color}${cluster}:${namespace}${c_reset}"
|
||||||
|
else
|
||||||
|
echo "-- ${prod_color}${cluster}:${namespace}${c_reset}"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ "$BASH" != "" ]; then
|
if [ "$BASH" != "" ]; then
|
||||||
# Prompt
|
# Prompt
|
||||||
PS1="\n╔ \w\$(prev_status_prompt)\$(git_prompt) -- \$(date '+%y-%m-%dT%H:%m:%S')\n╚ \h\$ "
|
PS1="\n╔ \w\$(prev_status_prompt)\$(git_prompt) \$(kubectl_context)\n╚ \h\$ "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
cf = commit --fixup
|
cf = commit --fixup
|
||||||
aq = commit --amend --no-edit
|
aq = commit --amend --no-edit
|
||||||
c = commit
|
c = commit
|
||||||
pf = push --force-with-lease
|
|
||||||
s = status -sb
|
s = status -sb
|
||||||
b = branch
|
b = branch
|
||||||
pp = log --color --graph --pretty=format:'%Cred%h%Creset %Cgreen(%cr) %Creset\t%s %C(bold blue)<%an> %C(yellow)%d%Creset' --abbrev-commit
|
pp = log --color --graph --pretty=format:'%Cred%h%Creset %Cgreen(%cr) %Creset\t%s %C(bold blue)<%an> %C(yellow)%d%Creset' --abbrev-commit
|
||||||
@ -55,7 +54,6 @@
|
|||||||
light = true
|
light = true
|
||||||
side-by-side = true
|
side-by-side = true
|
||||||
line-numbers = true
|
line-numbers = true
|
||||||
map-styles = bold purple => syntax magenta, bold cyan => syntax blue
|
|
||||||
|
|
||||||
[branch]
|
[branch]
|
||||||
autosetuprebase = always
|
autosetuprebase = always
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
The first method requires cloning the repository and running the install script manually.
|
The first method requires cloning the repository and running the install script manually.
|
||||||
|
|
||||||
git clone ssh://git@git.grosinger.net:22322/tgrosinger/dotfiles.git ~/.dotfiles
|
git clone git@github.com:tgrosinger/dotfiles.git ~/.dotfiles
|
||||||
cd ~/.dotfiles
|
cd ~/.dotfiles
|
||||||
./install.sh
|
./install.sh
|
||||||
|
|
||||||
@ -25,5 +25,4 @@
|
|||||||
|
|
||||||
The second method does not require cloning the repository however it does require that Git and Curl is installed on the target machine.
|
The second method does not require cloning the repository however it does require that Git and Curl is installed on the target machine.
|
||||||
|
|
||||||
\curl -sSL https://git.grosinger.net/tgrosinger/dotfiles/raw/branch/main/install.sh | bash
|
\curl -sSL https://raw.github.com/tgrosinger/dotfiles/master/install.sh | bash
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
bat-0.24.0
|
bat-0.23.0
|
Binary file not shown.
1
bin/linux/exa
Symbolic link
1
bin/linux/exa
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
exa-0.10.0
|
BIN
bin/linux/exa-0.10.0
Executable file
BIN
bin/linux/exa-0.10.0
Executable file
Binary file not shown.
@ -1 +0,0 @@
|
|||||||
eza-0.11.0
|
|
Binary file not shown.
@ -1 +0,0 @@
|
|||||||
gron-0.7.1
|
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
jq-1.7
|
jq-1.6
|
BIN
bin/linux/jq-1.6
Executable file
BIN
bin/linux/jq-1.6
Executable file
Binary file not shown.
BIN
bin/linux/jq-1.7
BIN
bin/linux/jq-1.7
Binary file not shown.
@ -58,10 +58,6 @@ function performSetup() {
|
|||||||
linkFile ".gitconfig"
|
linkFile ".gitconfig"
|
||||||
linkFile ".gitattributes"
|
linkFile ".gitattributes"
|
||||||
|
|
||||||
echo "Linking LazyGit..."
|
|
||||||
mkdir -p ~/.config/lazygit
|
|
||||||
ln -fns ${DOTFILES_DIR}/.lazygit ~/.config/lazygit/config.yml
|
|
||||||
|
|
||||||
echo "Linking tmux..."
|
echo "Linking tmux..."
|
||||||
linkFile ".tmux.conf"
|
linkFile ".tmux.conf"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user