From 2fc467e53406d6ce898961685c87d23aeedc426b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 4 Jun 2025 14:51:26 +0200
Subject: [PATCH] ljjklasdljkasdljk

---
 justfile | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/justfile b/justfile
index a7404ef..2084cb0 100644
--- a/justfile
+++ b/justfile
@@ -276,12 +276,19 @@ profile *args:
 
 # _JUST_NIX_BUILD_ARGS='--check'
 # _JUST_NIX_BUILD_ARGS='-j0 --builders "@/etc/nix/machines; ssh://pederbs@heid.idi.ntnu.no x86_64-linux - 24 5 big-parallel"'
-# _JUST_NIX_INSTANTIATE_ARGS='--system darwin'
 
-# TODO: is ^ now broken?
-@build-packages *$attrpaths:
-    [[ "$#" -gt 0 ]] || set -- $(just _some_packages); \
-    cd "$invokedir"; just _build_packages results "$@"
+[no-cd]
+build-packages *$attrpaths:
+    #!/usr/bin/env -S bash -euo pipefail
+    [[ "$#" -gt 0 ]] || set -- $(just _some_packages)
+    [[ "$#" -gt 0 ]]
+    export JUST_SYSTEM="$(just _a_system)"
+    [[ -n "$JUST_SYSTEM" ]]
+    if [[ -z "${_JUST_NIX_BUILD_ARGS:-}" ]]; then
+        _JUST_NIX_BUILD_ARGS="$(gum choose --no-limit -- "-j0" "--check" | tr '\n' ' ')"
+        export _JUST_NIX_BUILD_ARGS
+    fi
+    just _build_packages results "$@"
 
 [no-cd]
 _build_packages $outdir +$attrpaths:
@@ -427,7 +434,7 @@ _build_package_sources $system +packages:
 [no-cd]
 @commit-staged *$message:
     test -n "$(git diff HEAD --name-only --staged)" || ! echo >&2 "No files are staged!"
-    $GIT -c commit.template=<(git diff HEAD --name-only --staged | just _list_packages_fname_filtered | cut -f1 | xargs {{XARGS_NL}} printf "%s: ${*//%/%%}\n") commit && git show
+    $GIT -c commit.template=<(git diff HEAD --name-only --staged | just _list_packages_fname_filtered | cut -f1 | just _attrpaths_2_aliases | xargs {{XARGS_NL}} printf "%s: ${*//%/%%}\n") commit && git show
 
 [no-cd]
 commit-dirty-packages +$message=`gum input --placeholder="commit message, (attrpath: this message)"`:
@@ -498,7 +505,7 @@ push-new-pr:
 bump-new-worktree *packages:
     #!/usr/bin/env -S bash -euo pipefail -x
     declare -a packages=("$@")
-    [[ -n "${packages[*]}" ]] || packages=($(just _some_packages))
+    [[ -n "${packages[*]}" ]] || packages=($(JUST_USE_ALIASES=1 just _some_packages))
     export JUST_SYSTEM="$(just _a_system)"
     just get-versions "${packages[0]}"
     worktree=$(just _new_worktree bump "$(printf "%s\n" "${packages[0]}" | rev | cut -d. -f1 | rev)")
@@ -512,7 +519,7 @@ bump-here *packages:
     #!/usr/bin/env -S bash -euo pipefail -x
     [[ -e .git && flake.nix ]]
     declare -a packages=("$@")
-    [[ -n "${packages[*]}" ]] || packages=($(just _some_packages))
+    [[ -n "${packages[*]}" ]] || packages=($(JUST_USE_ALIASES=1 just _some_packages))
     system="$(just _a_system)"
     printf "%s.src\n" "${packages[@]}" | xargs {{XARGS_NL}} just __build_packages "$system" results-src-old ||: # TODO: unpack?
     config=(
@@ -1023,7 +1030,7 @@ enqueue-nixpkgs-review *$prs:
 
         # ssh
         if [[ -n "$prefix" ]]; then
-            cmd=( ssh "$(cut <<<"$prefix" -f1)" "cd $(cut <<<"$prefix" -f2) && systemd-run --scope --user $(printf " %q" "${cmd[@]}" )" )
+            cmd=( ssh "$(cut <<<"$prefix" -f1)" "cd $(cut <<<"$prefix" -f2) && systemd-run --scope --user nohup $(printf " %q" "${cmd[@]}" )" )
         fi
 
         (set -x; "${cmd[@]}" )
@@ -1096,10 +1103,19 @@ _packages_json:
     just list-packages >/dev/null
     just list-packages | cut -f1 | fzf --sync --layout=reverse | grep .
 
-@_some_packages: _packages_json
+_some_packages: _packages_json
+    #!/usr/bin/env -S bash -euo pipefail
     #gum spin --show-output just list-packages | cut -f1 | fzf --sync --layout=reverse --multi | grep .
     just list-packages >/dev/null
-    just list-packages | cut -f1 | fzf --sync --layout=reverse --multi | grep .
+    if [[ -n "${JUST_USE_ALIASES:-}" ]]; then
+        just list-packages | cut -f1 | fzf --sync --layout=reverse --multi | grep . | just _attrpaths_2_aliases
+    else
+        just list-packages | cut -f1 | fzf --sync --layout=reverse --multi | grep .
+    fi
+
+@_attrpaths_2_aliases:
+    sed -E 's/^python3[0-9]+Packages\./python3Packages./g' \
+     | tr '0123456789' '9876543210' | sort -u | tr '0123456789' '9876543210'
 
 @_this_system:
     nix config show system