diff --git a/users/clover/home.nix b/users/clover/home.nix index 5158945a91c454f9c5d31521ec2062e4db2066b8..5fb0d3e278fe30910d702ec5e12ed553fc1461e3 100644 --- a/users/clover/home.nix +++ b/users/clover/home.nix @@ -60,10 +60,16 @@ in enable = true; shellAliases = { switch = "~/config/switch"; - gg = "lazygit"; - ga = "git add"; - g = "git status"; - gp = "git pull --rebase && git push"; + + # move a bookmark from the previous commit + jf = "jj git fetch"; + e = "jj edit"; + d = "jj desc"; + bup = "jj b m --from 'parents(@)' --to '@'"; + push = "jj git push"; + moveself = "jj rebase -r @ -d"; + logall = "jj log -r 'all()'"; + cherry = "jj git fetch && jj split -i -p -m 'SPLIT_CHANGES' && jj edit -r 'description(\"SPLIT_CHANGES\")' && jj desc -m '' --edit"; }; initContent = '' export PS1="%{$(tput setaf 207)%}%m%{$(tput setaf 15)%}:%{$(tput setaf 87)%}%~ %{$(tput sgr0)%}$ " @@ -75,6 +81,21 @@ in fi uv run --project "$dirname" "$@" } + + function pr() { + message=$(jj log -r '@' -T 'description' --no-graph) + if [[ -z "$message" ]] || [[ "$message" = "WIP:"* ]]; then + jj desc + fi + if [ -n "$1" ]; then + jj git push --named "clo/$1"=@ + branch="clo/$1" + else + branch="$(jj log -r '@' -T '"clo/push-" ++ change_id.short()' --no-graph)" + jj git push -c @ + fi + open "$(git remote get-url origin | sed 's/git@github\.com:/https:\/\/github.com\//' | sed 's/\.git$//')/compare/master...$branch" + } ''; }; diff --git a/users/clover/work/home.nix b/users/clover/work/home.nix index f1f78f8ac0aaef5a8242939fa6e8f0cfb032132e..3dcb3ea9c5e53de6b451d59bbcbb3d78a1cff0cf 100644 --- a/users/clover/work/home.nix +++ b/users/clover/work/home.nix @@ -10,10 +10,10 @@ }; home.packages = with pkgs; [ (bun.overrideAttrs (_: rec { - version = "1.2.23"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-IvX6P/9ysNO45+D4BR7K3y5Bkg1HSsYttSeRRICckAU="; + hash = "sha256-hYSOP5ZIHvyr51pQD9O5S5u5VoaretCjiSl2x74VA2o="; }; })) doppler