been a while with no updates

LarsEckart · Nov 5, 2024 · 67b5bdf · 67b5bdf
1 parent 07bec14
commit 67b5bdf
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 24 deletions.
diff --git a/.aliases b/.aliases
@@ -15,10 +15,10 @@ alias cat='bat'
 # Easier navigation:
 alias ..="cd .."
 
-alias l='exa'
-alias ll='exa -laFh'
-alias ls='exa -lah --color=auto'
-alias la='exa -laFh'
+alias l='eza'
+alias ll='eza -lah'
+alias ls='eza -lah --color=auto'
+alias la='eza -lah'
 
 # alias grep='rg'
 

diff --git a/.exports b/.exports
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+export CI=false
+
 # Make vim the default editor.
 export EDITOR='vim';
 
@@ -36,7 +38,9 @@ export GPG_TTY=$(tty);
 # java
 #export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
 #export JAVA_HOME="$(/usr/libexec/java_home -v 11)"
-export JAVA_HOME="$(/usr/libexec/java_home -v 21)"
+#export JAVA_HOME="$(/usr/libexec/java_home -v 17)"
+#export JAVA_HOME="$(/usr/libexec/java_home -v 21)"
+export JAVA_HOME="$(/usr/libexec/java_home -v 23)"
 
 export PATH=${PATH}:${JAVA_HOME}/bin
 
@@ -45,7 +49,7 @@ export ANDROID_HOME=$HOME/Library/Android/sdk
 
 
 # gradle
-export GRADLE_HOME="/usr/local/Cellar/gradle/8.5"
+export GRADLE_HOME="/usr/local/Cellar/gradle/8.10.1"
 
 export GROOVY_HOME=/usr/local/opt/groovy/libexec
 
@@ -60,5 +64,5 @@ export PATH="/usr/local/share/dotnet:$PATH"
 
 export PATH=/opt/homebrew/bin:$PATH
 
-# The .NET tools collect usage data. You can opt-out of telemetry by setting the 
+# The .NET tools collect usage data. You can opt-out of telemetry by setting the
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
diff --git a/.functions b/.functions
@@ -6,12 +6,18 @@ red() {
 	git clean -df
 }
 
+# "check out a given PR for review"
+revpr() {
+  gh co $1
+  git reset --mixed master
+}
+
 search() {
 	if [ "$#" -ne 1 ]; then
         echo "Error: Please provide exactly one argument enclosed in quotes."
         return 1
     fi
-	
+
 	local pattern="$1"
     grep -Rnw . -e "$pattern"
 }
@@ -280,7 +286,7 @@ sqlformat(){
 #
 # The bumbailiff allows the team to take up a small amount of technical debt
 # (TODOs in the code) for a limited period. After that period the script fails.
-# 
+#
 # It will find // TODO in .js or .jsx files, and # TODO in .feature files.
 #
 # For example, if the allowed period for all the TODOs is 14 days.
@@ -349,4 +355,4 @@ fi
 
 echo -e "💵  ${color}${total_days} TODO-days accumulated. Max allowance is ${MAX_AGE}${NC}"
 # exit ${status}
-}
+}
diff --git a/.gitconfig b/.gitconfig
@@ -1,3 +1,15 @@
+[include]
+	path = ~/.dotfiles/.gitconfig-personal
+[includeIf "gitdir/i:~/work/"]
+    path = ~/.dotfiles/.gitconfig-work
+[user]
+    # https://markentier.tech/posts/2021/02/github-with-multiple-profiles-gpg-ssh-keys/
+	# But if, say, you want Git to use one email address for your open source projects and a different one for your work projects, you’ve undoubtedly
+	# made the mistake of committing to a new Git repository without having first set your email address in that repository.
+	# In this situation, Git emits a warning, but it creates the commit anyway, using an email address that it guesses from the local system hostname.
+	# If you’re trying to do something as complicated as different addresses for different projects, this is almost certainly not what you want.
+	# Now you can tell Git not to guess, but rather to insist that you set user.name and user.email explicitly before it will let you commit:
+	useConfigOnly = true
 [alias]
 	# Displays all local branches in the order of their last commit, allowing to see what you worked on when.
 	wip = for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads
@@ -30,21 +42,10 @@
 	added = yellow
 	changed = green
 	untracked = cyan
-[include]
-	path = ~/.dotfiles/.gitconfig-personal
-[includeIf "gitdir/i:~/work/"]
-    path = ~/.dotfiles/.gitconfig-work
-[user]
-	# But if, say, you want Git to use one email address for your open source projects and a different one for your work projects, you’ve undoubtedly 
-	# made the mistake of committing to a new Git repository without having first set your email address in that repository. 
-	# In this situation, Git emits a warning, but it creates the commit anyway, using an email address that it guesses from the local system hostname. 
-	# If you’re trying to do something as complicated as different addresses for different projects, this is almost certainly not what you want.
-	# Now you can tell Git not to guess, but rather to insist that you set user.name and user.email explicitly before it will let you commit:
-	useConfigOnly = true
 [diff]
 	# https://git-scm.com/docs/git-config#git-config-diffrenames
-	# Whether and how Git detects renames. If set to "false", rename detection is disabled. 
-	# If set to "true", basic rename detection is enabled. 
+	# Whether and how Git detects renames. If set to "false", rename detection is disabled.
+	# If set to "true", basic rename detection is enabled.
 	# If set to "copies" or "copy", Git will detect copies, as well.
 	renames = copies
 	# https://git-scm.com/docs/git-config#git-config-diffwordRegex

diff --git a/brew.sh b/brew.sh
@@ -57,7 +57,7 @@ brew install hadolint   # Haskell Dockerfile Linter
 brew install telnet
 brew install hugo
 brew install bat # better cat
-brew install exa # better ls
+brew install eza # better ls
 brew install nmap  # nmap -F 192.168.1.1
 brew install yamllint
 brew install vale
@@ -85,6 +85,10 @@ brew install grype
 
 brew install rbenv
 
+# https://github.com/chadgeary/cloudblock/blob/master/oci/README.md
+brew install terraform git oci-cli
+
+brew install derailed/k9s/k9s
 
 # Apps