Compare commits

...

10 Commits

16 changed files with 20 additions and 38 deletions

36
.bashrc
View File

@ -1,6 +1,6 @@
# Navigation # Navigation
alias lg="lazygit" alias lg="lazygit"
alias ls="exa --long --header --git --group" alias ls="eza --long --header --git --group --time-style long-iso"
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,41 +152,11 @@ git_prompt () {
git_branch=$(git branch 2>/dev/null| sed -n '/^\*/s/^\* //p') git_branch=$(git branch 2>/dev/null| sed -n '/^\*/s/^\* //p')
if git diff --quiet 2>/dev/null >&2; then echo " -- $git_branch"
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) \$(kubectl_context)\n╚ \h\$ " PS1="\n╔ \w\$(prev_status_prompt)\$(git_prompt) -- \$(date '+%y-%m-%dT%H:%m:%S')\n╚ \h\$ "
fi fi

View File

@ -17,6 +17,7 @@
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
@ -54,6 +55,7 @@
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

4
.lazygit Normal file
View File

@ -0,0 +1,4 @@
gui:
timeFormat: '2006-01-02'
mouseEvents: false

View File

@ -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 git@github.com:tgrosinger/dotfiles.git ~/.dotfiles git clone ssh://git@git.grosinger.net:22322/tgrosinger/dotfiles.git ~/.dotfiles
cd ~/.dotfiles cd ~/.dotfiles
./install.sh ./install.sh
@ -25,4 +25,5 @@
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://raw.github.com/tgrosinger/dotfiles/master/install.sh | bash \curl -sSL https://git.grosinger.net/tgrosinger/dotfiles/raw/branch/main/install.sh | bash

View File

@ -1 +1 @@
bat-0.23.0 bat-0.24.0

View File

@ -1 +0,0 @@
exa-0.10.0

Binary file not shown.

1
bin/linux/eza Symbolic link
View File

@ -0,0 +1 @@
eza-0.11.0

BIN
bin/linux/eza-0.11.0 Executable file

Binary file not shown.

1
bin/linux/gron Symbolic link
View File

@ -0,0 +1 @@
gron-0.7.1

BIN
bin/linux/gron-0.7.1 Executable file

Binary file not shown.

View File

@ -1 +1 @@
jq-1.6 jq-1.7

Binary file not shown.

BIN
bin/linux/jq-1.7 Executable file

Binary file not shown.

View File

@ -58,6 +58,10 @@ 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"