Merge pull request #175 from codepuncher/2024-06-17

2024 06 17

git/gitconfig

@@ -1,13 +1,6 @@
 [user]
 	name = codepuncher
 	email = [email protected]
-	signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6lhgN8pvPgXJpgr8e4vo6k0nwP4mI8zgQcYMvePPBCNy8zZHS9BTKHPy/EdwNrCKX87uv0HcJeIztCShfmu7OjvasO6zgNzaNTOPxmelm7osBIuGYyZYih33ruT11eK8/RfeDh81OZGzMmez+Szk+oK1mb32rZvBPZpu2iGRFu0Yxx3jWtY+Kn8kwZX1GrfGEAfd29qoJiQli0Ma6YQhpioPgO7ybL8TCEvmkQPlCvHHpPhebwII8I2nZyGVpuIZsVleJW+fUroGOPDJ3xBcAs18YTMnQa/RDfUl0zsC6ZYa0MqnXUC6INBmNSk/hwLTmeVYDXau4DOLC8OpIaFkz
-
-[gpg]
-	format = ssh
-
-[commit]
-	gpgsign = true
 
 [filter "lfs"]
 	clean = git-lfs clean -- %f
@@ -35,7 +28,6 @@
 
 [core]
 	pager = delta
-	sshCommand = ssh.exe
 
 [interactive]
 	diffFilter = delta --color-only

git/users/wsl.gitconfig

@@ -1,2 +1,17 @@
+[user]
+	name = codepuncher
+	email = [email protected]
+	signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6lhgN8pvPgXJpgr8e4vo6k0nwP4mI8zgQcYMvePPBCNy8zZHS9BTKHPy/EdwNrCKX87uv0HcJeIztCShfmu7OjvasO6zgNzaNTOPxmelm7osBIuGYyZYih33ruT11eK8/RfeDh81OZGzMmez+Szk+oK1mb32rZvBPZpu2iGRFu0Yxx3jWtY+Kn8kwZX1GrfGEAfd29qoJiQli0Ma6YQhpioPgO7ybL8TCEvmkQPlCvHHpPhebwII8I2nZyGVpuIZsVleJW+fUroGOPDJ3xBcAs18YTMnQa/RDfUl0zsC6ZYa0MqnXUC6INBmNSk/hwLTmeVYDXau4DOLC8OpIaFkz
+
+[core]
+	pager = delta
+	sshCommand = ssh.exe
+
+[commit]
+	gpgsign = true
+
+[gpg]
+	format = ssh
+
 [gpg "ssh"]
 	program = "/mnt/c/Users/LeeHanbury-Pickett/AppData/Local/1Password/app/8/op-ssh-sign-wsl"

shell/aliases

@@ -1,5 +1,16 @@
 #!/usr/bin/env bash
 
+function is_wsl() {
+	[ -f /proc/sys/kernel/osrelease ] && [[ $(</proc/sys/kernel/osrelease) =~ 'WSL' ]]
+}
+
+# SSH
+if is_wsl; then
+	alias ssh='ssh.exe'
+	alias ssh-add='ssh-add.exe'
+	alias ssh-keygen='ssh-keygen.exe'
+fi
+
 # Git
 alias g='git'
 alias ga='g add'
@@ -229,21 +240,25 @@ project_open() {
 		tmux setw automatic-rename
 	else
 		NEW_PATH="${WP_PATH}/${1}"
-		if [[ -d "${NEW_PATH}/bedrock" ]]; then
-			NEW_PATH="${NEW_PATH}/bedrock"
-		elif [[ -d "${NEW_PATH}/site" ]]; then
-			NEW_PATH="${NEW_PATH}/site"
-		fi
-
 		tmux rename-window "${1}"
 	fi
 
-	if [ -z "${2}" ]; then
-		cd "${NEW_PATH}" && return || return
+	if [ -n "${2}" ] && [[ "${2}" != "theme" ]]; then
+		# shellcheck disable=SC2164
+		cd "${NEW_PATH}/${2}"
+		return
 	fi
 
-	if [[ "${2}" == @(bedrock|trellis) || "${2}" != "theme" ]]; then
-		cd "${NEW_PATH}/${2}" && return || return
+	if [[ -d "${NEW_PATH}/bedrock" ]]; then
+		NEW_PATH="${NEW_PATH}/bedrock"
+	elif [[ -d "${NEW_PATH}/site" ]]; then
+		NEW_PATH="${NEW_PATH}/site"
+	fi
+
+	if [ -z "${2}" ]; then
+		# shellcheck disable=SC2164
+		cd "${NEW_PATH}"
+		return
 	fi
 
 	# Find only themes using Composer.