| ... | @@ -38,6 +38,9 @@ in | ... | @@ -38,6 +38,9 @@ in |
| 38 | ]; | 38 | ]; |
| 39 | in | 39 | in |
| 40 | all ++ (if host.darwin then darwin else linux) ++ (if hostServer then server else desktop); | 40 | all ++ (if host.darwin then darwin else linux) ++ (if hostServer then server else desktop); |
| | 41 | sessionPath = [ |
| | 42 | "$HOME/.local/bin" |
| | 43 | ]; |
| 41 | }; | 44 | }; |
| 42 | programs = { | 45 | programs = { |
| 43 | # sort-lines:start | 46 | # sort-lines:start |
| ... | @@ -72,8 +75,8 @@ in | ... | @@ -72,8 +75,8 @@ in |
| 72 | jf = "jj git fetch"; | 75 | jf = "jj git fetch"; |
| 73 | e = "jj edit"; | 76 | e = "jj edit"; |
| 74 | d = "jj desc"; | 77 | d = "jj desc"; |
| 75 | bup = "jj b m --from 'heads(::@- & bookmarks())' --to '@'"; | 78 | bup = "jj b m --from 'heads(::@- & bookmarks()) ~ (master | bookmarks(glob:\"deployment*\"))' --to '@'"; |
| 76 | moveself = "jj rebase -r @ -d"; | 79 | moveself = "jj rebase -s @ -d"; |
| 77 | logall = "jj log -r 'all()'"; | 80 | logall = "jj log -r 'all()'"; |
| 78 | cherry = "jj git fetch && jj split -i -p -m 'SPLIT_CHANGES' && jj edit -r 'description(\"SPLIT_CHANGES\")' && jj desc -m '' --edit"; | 81 | cherry = "jj git fetch && jj split -i -p -m 'SPLIT_CHANGES' && jj edit -r 'description(\"SPLIT_CHANGES\")' && jj desc -m '' --edit"; |
| 79 | }; | 82 | }; |