misc

Author: ringerc

3dprinting/STL/thingiverse_4077336_breville_smart_grinder_BGC800XL_impeller_v2/README.md

@@ -0,0 +1,5 @@
+[Thingiverse item 4077336 Breville Coffee Grinder Impeller Replacement - Type 2](https://www.thingiverse.com/thing:4077336/files)
+
+By user [acetic](https://www.thingiverse.com/acetic)
+
+This is my backup copy only

3dprinting/STL/thingiverse_4077336_breville_smart_grinder_BGC800XL_impeller_v2/Smartgrinder_impeller_Type_2_v2.0.stl

@@ -368,4 +368,31 @@ export EDITOR=vim
 
 export MOZ_DBUS_REMOTE=1
 
+export POWERSHELL_TELEMETRY_OPTOUT=1
+export POWERSHELL_UPDATECHECK=Off
+
+export WINEPREFIX=$HOME/.local/share/wineprefixes/Apps/
+# default to 32 bit for wine
+export WINEARCH=win32
+
+alias kind='KUBECONFIG=~/.kube/config/kind kind'
+
+export upm="$HOME/projects/EDB/UPM"
+export substrate="$HOME/projects/EDB/upm-substrate-notsubmodule"
+
+shopt -s direxpand
+shopt -s cdable_vars
+
+alias opsignin='if [ -z "$(op account list --format json | jq -r "(.[]|select(.shorthand==\"team_edb\")|.user_uuid|(\"OP_SESSION_\"+.)|env[.]) // \"\"")" ]; then eval $(op signin --account team_edb); else echo "already signed in to account team_edb"; fi'
+
+alias ghp='opsignin && eval $(opcred --format=eval "github api token ringerc") && GH_API_TOKEN="${credential}" && unset credential && echo "set non-exported variable GH_API_TOKEN" 1>&2 && echo "Use with GH_API_TOKEN=\"\${GH_API_TOKEN}\" mycommand" 1>&2'
+alias ghcred=ghp
+
+alias kc=kubectl
+
+if type -p direnv >&/dev/null
+then
+  eval "$(direnv hook bash)"
+fi
+
 # vim: ts=4 sw=4 et ai

misc/bashenv/bash_aliases

@@ -3,16 +3,42 @@
 	email = [email protected]
 [credential]
 	helper = /usr/libexec/git-core/git-credential-libsecret
+[core]
+	excludesfile = ~/projects/scrapcode/misc/git/gitignore-global
+	editor = vim
 [push]
 	default = current
+[pull]
+	ff = only
 [merge]
-	tool = vimdiff
+	#tool = vimdiff
+	tool = meld
 	conflictstyle = diff3
+
+[mergetool "meld"]
+    # Choose one of these 2 lines (not both!) explained below.
+    #cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
+    cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
+
 [log]
 	abbrevCommit = true
 [rebase]
 	abbreviateCommands = true
 	stat = true
 	autoSquash = true
-[core]
-	excludesfile = ~/projects/scrapcode/misc/git/gitignore-global
+[diff]
+	renames = copies
+	algorithm = patience
+	tool = meld
+[difftool]
+	prompt = false
+[difftool "meld"]
+	cmd = meld "$LOCAL" "$REMOTE"
+[fetch]
+	writeCommitGraph = on
+[alias]
+	show = show --find-copies-harder
+	sh = show --find-copies-harder
+	st = status
+	lg = log --find-copies-harder --stat --notes
+# Add the following to your .gitconfig file.

misc/git/gitconfig-shared

@@ -15,8 +15,8 @@ packadd! nerdcommenter
 packadd! pgsql.vim
 packadd! syntastic
 packadd! vim-better-whitespace
-packadd! vim-easytags
-packadd! vim-fugitive
+"packadd! vim-easytags
+"packadd! vim-fugitive
 packadd! vim-json
 packadd! vim-sleuth
 packadd! vim-sneak