🚨 [security] [userscripts] Update webpack 5.39.1 → 5.89.0 (minor)

.gitmodules

@@ -4,8 +4,8 @@
 	pushurl = git@github.com:forivall/elevate.git
 [submodule "zgen"]
 	path = zgen
-	url = https://github.com/forivall/zgen.git
-	pushurl = git@github.com:forivall/zgen.git
+	url = https://github.com/jandamm/zgenom.git
+	pushurl = git@github.com:jandamm/zgenom.git
 [submodule "plugins/external-tools/fabiokr-dotfiles"]
 	path = plugins/external-tools/fabiokr-dotfiles
 	url = https://github.com/forivall/fabiokr-dotfiles.git

.helix/languages.toml

@@ -0,0 +1,3 @@
+[[language]]
+name = "git-ignore"
+file-types = ["gitignore"]

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "semi": false
+}

brew.sh

@@ -15,10 +15,10 @@ brew install entr # run command on change
 brew install direnv # .envrc files
 brew install coreutils findutils dateutils moreutils util-linux telnet \
   gnu-tar gnu-sed gawk gnutls gssh gnu-indent gnu-getopt colordiff rename expect pgrep
-brew install less # macos built in less uses posix regex; brew less uses pcre2
+brew install less lesspipe # macos built in less uses posix regex; brew less uses pcre2
 brew install curl-openssl
 # https://github.com/ibraheemdev/modern-unix
-brew install moar most colordiff trash htop tree ripgrep fd sd exa broot choose vim ranger cfonts ruplacer
+brew install moar most colordiff trash htop tree ripgrep fd sd exa chafa broot choose vim ranger cfonts ruplacer
 brew install libtool autoconf automake m4 cmake gcc gdb xcodegen
 brew install git hub gh glab git-extras git-lfs git-credential-manager
 brew install git-interactive-rebase-tool git-revise git-bit git-open git-recent
@@ -83,7 +83,8 @@ brew install graphviz # xdot plantuml
 brew install graphicsmagick
 brew install optipng pngcrush advancecomp jpegoptim gifsicle pngquant # image compression tools
 brew install ffmpeg
-# brew install exiftool libexif jhead gexiv2
+brew install exiftool
+# brew install libexif jhead gexiv2
 # brew install pngpaste argyll-cms
 brew install gollum github-markdown-toc
 # brew tap mike-engel/jwt-cli && brew install jwt-cli
@@ -116,7 +117,8 @@ brew install --cask visual-studio-code
 brew install --cask sublime-merge sublime-text # sublime merge uses installed sublime text syntaxes
 brew install --cask iterm2 termhere
 
-brew install --cask karabiner-elements middleclick
+brew install --cask karabiner-elements middleclick mos
+# brew install --cask mouse-fix linearmouse
 brew install --cask beardedspice
 brew install --cask rectangle
 # https://bahoom.com/hyperdock/
@@ -134,6 +136,7 @@ brew install --cask github # (github desktop)
 brew install --cask cheatsheet cacher
 brew install --cask gitup rowanj-gitx fork
 # brew install --cask postman
+brew install --cask firecamp
 brew install --cask insomnia
 brew install --cask clipy
 # also, https://langui.net/clipboard-viewer/
@@ -151,7 +154,7 @@ brew install --cask monitorcontrol
 # brew install --cask loom
 brew install --cask cameracontroller logitech-camera-settings
 brew install --cask launchcontrol
-brew install dark-mode
+brew install dark-mode smudge/smudge/nightlight
 curl -OL "$(curl --silent https://su.darkmodebuddy.app/appcast.xml | xq -r '.rss.channel.item.enclosure."@url"')" &&
   open DarkModeBuddy*.dmg
 

config/yabairc

@@ -0,0 +1,3 @@
+# yabai -m config layout bsp
+yabai -m config window_border_width 2
+

gh/config.yml

@@ -12,10 +12,16 @@ aliases:
   co: pr checkout
   mrb: pr view --web
   prb: pr view --web
+  prc: pr create --web
   ib: issue view --web
   brb:
     '!gh browse --branch $(git rev-parse --abbrev-ref --symbolic-full-name @{u}
     | sd "^[^/]*/" "" ) "$@"'
+  pr-merge-base: '!git merge-base ${1-HEAD} origin/$(gh pr view $2 --json baseRefName -q .baseRefName)'
+  pr-merge-commit: pr view $1 --json mergeCommit -q .mergeCommit.oid
+  pr-ref-name: pr view $1 --json headRefName -q .headRefName
+  pr-ref: pr view $1 --json headRefOid -q .headRefOid
+  pr-range: "pr view --json baseRefName,headRefName -q '\"origin/\"+.baseRefName+\"...origin/\"+.headRefName'"
 # The path to a unix socket through which send HTTP connections. If blank, HTTP traffic will be handled by net/http.DefaultTransport.
 http_unix_socket:
 # What web browser gh should use when opening URLs. If blank, will refer to environment.

gitconfig

@@ -10,7 +10,7 @@
 	pager = moar --no-linenumbers
 	excludesfile = ~/.gitignore
 	trustctime = false
-	editor = vim
+	editor = hx
 	# trustctime = false
 [diff]
 	renames = copies
@@ -24,46 +24,73 @@
 	navigate = true  # use n and N to move between diff sections
 	minus-style = syntax auto
 	syntax-theme = base16-tomorrow-night
+	features = map-styles-dark
 	# hyperlinks = true
+[delta "map-styles-dark"]
+	map-styles = \
+		bold purple => syntax "#330f29", \
+		bold blue => syntax "#271344", \
+		bold cyan => syntax "#0d3531", \
+		bold yellow => syntax "#222f14"
+[delta "map-styles-light"]
+	map-styles = \
+		bold purple => syntax "#feecf7", \
+		bold blue => syntax "#e5dff6", \
+		bold cyan => syntax "#d8fdf6", \
+		bold yellow => syntax "#f4ffe0"
 [alias]
 	aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /' | sort
 	br = branch
 	ci = commit
 	cie = commit-edit
 	co = checkout
 	cop = checkoutp
+
 	st = status -b -s
 	stat = status -b -s
+
 	# --pretty=format:"%H%x20%an%x09%ad%x09%s"
-	ahead = log --name-status --pretty="format:\"%C(yellow)%h%C(magenta) %an %Creset%Cblue%ar%Creset %s \"" --graph HEAD ^origin/HEAD
+	ahead = log --name-status --pretty=onemore --graph HEAD ^origin/HEAD
 	ahead-root = !git --no-pager log --oneline HEAD ^origin/HEAD
 	ahead2 = log --name-status --abbrev-commit --pretty=oneline --graph --decorate HEAD ^origin/HEAD
 	exclude = "!f() { for p in \"$@\" ; do echo \"$GIT_PREFIX$p\" >> $GIT_DIR/info/exclude ; done; }; f"
+	delta = -c core.pager=deltaw diff
+	deltac = -c core.pager=deltaw diff --cached
+	deltas = -c core.pager=deltaw show
 	diffc = diff --cached
-	last = show --oneline --name-status --decorate
+	diffd = -c core.pager=deltaw diff
+	diffcd = -c core.pager=deltaw diff --cached
+	showd = -c core.pager=deltaw show
+	stashsd = -c core.pager=deltaw stash show -p
+	last = -c pager.show=off show --oneline --name-status --decorate
+	last2 = last --name-status --pretty=twomore
 	l = log --pretty=oneline --abbrev-commit --decorate --graph
-	lu = log --pretty=oneline --abbrev-commit --decorate --graph HEAD @{u}
+	lr = log --pretty=oneline --abbrev-commit --decorate --graph --simplify-by-decoration --tags
+	lu = logu --pretty=oneline --abbrev-commit --decorate --graph
 	lup = "!git log --pretty=oneline --abbrev-commit --decorate --graph HEAD @{u} $(git rev-parse --symbolic --glob=\"$(git rev-parse --symbolic-full-name @{u})*\")"
 	lus = log --pretty=oneline --abbrev-commit --decorate --graph --simplify-by-decoration HEAD @{u}
 	li = log --pretty=oneline --abbrev-commit --decorate --graph HEAD @{u}  # <kbd>i</kbd> is much easier to hit than <kbd>u</kbd>
 	la = log --pretty=oneline --abbrev-commit --decorate --graph --exclude=refs/stash --exclude=refs/remotes/*/archive/** --exclude=refs/tags/archive/** --all
 	las = log --pretty=oneline --abbrev-commit --decorate --graph --exclude=refs/stash --exclude=refs/remotes/*/archive/** --exclude=refs/tags/archive/** --all --simplify-by-decoration
 	laa = log --pretty=oneline --abbrev-commit --decorate --graph --all
 	lo = log --pretty=oneline --abbrev-commit --decorate --graph --remotes=origin --branches
-	l2 = log --pretty="tformat:\"%C(yellow)%h%C(red bold)%d%C(magenta) %an %Creset%Cblue%ar%Creset %s\"" --graph --no-notes
-	l3 = log --pretty="tformat:\"%C(yellow)%h%C(red bold)%d%C(magenta) %aE %Creset%Cblue%ad%C(green)%gn%Creset %n%s\"" --graph --date=local
+	l2 = log --pretty=onemore --decorate --graph --no-notes
+	l3 = log --pretty=twoline --decorate --graph --date=local
 	lg = log --name-status --pretty=oneline --abbrev-commit --decorate --graph
 	lga = log --name-status --pretty=oneline --abbrev-commit --decorate --graph --all
-	lg2 = log --name-status --pretty="format:\"%C(yellow)%h%C(red bold)%d%C(magenta) %an %Creset%Cblue%ar%Creset %s\"" --graph --no-notes
-	lg3 = log --name-status --pretty="format:\"%C(yellow)%h%C(red bold)%d%C(magenta) %aE %Creset%Cblue%ad%C(green)%gn%Creset %n%s\"" --graph --date=local
-	lgp = log -p --pretty="format:\"%C(yellow)%h%C(red bold)%d%C(magenta) %an %Creset%Cblue%ar%Creset %s\"" --graph
-  logp2 = logp --pretty='%C(yellow)%H%C(red bold)%d%C(magenta)%n%an <%ae>%Creset%nA: %Cblue%aD%Creset, C: %Cblue%cD%Creset%n%n%s%n%n%b'
+	lg2 = log --name-status --pretty=onemore --graph --no-notes
+	lg3 = log --name-status --pretty=twoline --graph --date=local
+	lgp = log -p --pretty=onemore --graph
+	logd = -c core.pager=deltaw log --pretty=concise
+	logp2 = logp --pretty=concise
+	show2 = show --pretty=concise
+	showd2 = showd --pretty=concise
 	ll = log --pretty=oneline --abbrev-commit --decorate --graph --branches=*
 	branches = branch --list
 	branches-with-upstreams = "!git rev-parse --symbolic --branches | while read branch; do echo $branch; up=$(git rev-parse --symbolic $branch@{u} 2>/dev/null) && echo $up; done"
 	llu = "!git log --pretty=oneline --abbrev-commit --decorate --graph $(git branches-with-upstreams)"
 	llus = "!git log --pretty=oneline --abbrev-commit --decorate --graph --simplify-by-decoration  $(git branches-with-upstreams)"
-	shlg = log --name-status --pretty=raw --abbrev-commit --decorate --graphlast = show --name-status --pretty="format:\"%C(yellow)%h%C(magenta) %an %Creset%Cblue%ar%Creset %s \"" --graph
+	shlg = log --name-status --pretty=raw --abbrev-commit --decorate --graph
 	tracking-status = for-each-ref --format='%(refname:short) <- %(upstream:short)' refs/heads
 	ignore-for-now = update-index --assume-unchanged
 	update-branch-upstream = "!f() { branch=$1; shift; git update-ref \"refs/heads/$branch\" \"$branch@{u}\" $@; }; f"
@@ -111,16 +138,10 @@
 	reword = commit --amend
 	cob = checkout-branch
 	checkout-branch = checkout
-	delta = diff
-	diffd = diff
-	deltac = diff --cached
-	diffcd = diff --cached
-	deltas = show
-	showd = show
 	unresolve = checkout --conflict=merge
 	config-user = "!git config --local user.name \"$1\" && git config --local user.email \"$2\" && :"
 	# for ease of use, add a `git-config-signing` in ~/.local/bin with the key id as default
-	config-signing = "!git config --local user.signingkey \"$1\" && git config --local commit.gpgSign true && :"
+	config-signing = "!git config --local user.signingkey \"$1\" && git config --local commit.gpgSign true && git config --local tag.gpgSign true && :"
 
 	archive-untracked-files = !git-archive-untracked-files
 	branch-archive = !git-branch-archive
@@ -129,6 +150,7 @@
 	file-size-diff = !git-file-size-diff
 	find-blob = !git-find-blob
 	has-changes = !git-has-changes
+	push-feature-deploy = !git-push-feature-deploy
 	resolve-conflicts = !git-resolve-conflicts
 
 [color]
@@ -164,6 +186,11 @@
 	last = false
 	ll = true
 	ls-files = false
+[pretty]
+	concise = "format:%C(yellow)• %H%C(auto)%d%n%C(magenta)♘ %an <%ae> %C(dim)♖ %cn <%ce>%Creset%n%C(blue)✍ %aD %C(dim)♔ %cD%Creset%n%n%-s%n%Creset%n%-b"
+	onemore = "format:%C(yellow)%h%C(auto)%d%C(magenta) %an %Creset%C(blue)%ar%Creset %s"
+	twomore = "format:%C(yellow)%h%C(auto)%d%C(magenta) %an %Creset%C(blue)%ar%Creset%n%-s"
+	twoline = "format:%C(yellow)%h%C(auto)%d%C(magenta) %aE %Creset%C(blue)%ad%C(green)%gn%Creset %n%s"
 [giggle]
 	file-view-vpane-position = 807
 	history-view-vpane-position = 216
@@ -255,7 +282,7 @@
 [init]
 	defaultBranch = main
 [extensions]
-  worktreeConfig = true
+	worktreeConfig = true
 [credential "https://dev.azure.com"]
 	useHttpPath = true
 [sequence]

helix/config.toml

@@ -0,0 +1,7 @@
+theme = "thursday"
+
+# theme = "sonokai"
+# theme = "tokyonight"
+
+[editor.cursor-shape]
+insert = "bar"

helix/themes/thursday.toml

@@ -0,0 +1,9 @@
+inherits = "base16_transparent"
+
+# "ui.cursor" = { modifiers = [], underline = { color = "#000000", style = "dotted"} }
+"ui.cursor.primary" = { modifiers = ["reversed"], underline = { color = "#000000", style = "line"}, fg = "#a0a0a0" }
+"ui.cursor.secondary" = { modifiers = ["reversed"], underline = { color = "#000000", style = "dotted"} }
+"ui.virtual.ruler" = { bg = "light-gray" }
+"markup.heading" = { fg = "cyan" }
+"markup.normal" = { fg = "black" }
+"comment" = { fg = "white", modifiers = ["italic"] }