diff --git a/modules/common/helix.nix b/modules/common/helix.nix index f77ec8c..09c5d4f 100644 --- a/modules/common/helix.nix +++ b/modules/common/helix.nix @@ -22,13 +22,13 @@ in { })]; home-manager.sharedModules = [{ - programs.nushell.configFile.text = mkIf (config.isDesktop && config.isLinux) <| mkAfter /* nu */ '' + programs.nushell.configFile.text = mkIf /*(*/config.isDesktop/* && config.isLinux)*/ <| mkAfter /* nu */ '' def --wrapped hx [...arguments] { if $env.TERM == "xterm-kitty" { kitty @ set-spacing padding=0 } - ^hx ...$arguments + RUST_BACKTRACE=full ^hx ...$arguments if $env.TERM == "xterm-kitty" { kitty @ set-spacing padding=${toString config.theme.padding} diff --git a/modules/common/jujutsu.nix b/modules/common/jujutsu.nix index e33bc60..36a71eb 100644 --- a/modules/common/jujutsu.nix +++ b/modules/common/jujutsu.nix @@ -41,19 +41,27 @@ in { aliases.e = [ "edit" ]; - aliases.l = [ "log" ]; - aliases.ls = [ "log" "--summary" ]; - aliases.la = [ "log" "--revisions" "::" ]; + aliases.l = [ "log" ]; + aliases.la = [ "log" "--revisions" "::" ]; + aliases.ls = [ "log" "--summary" ]; + aliases.lsa = [ "log" "--summary" "--revisions" "::" ]; + aliases.lp = [ "log" "--patch" ]; + aliases.lpa = [ "log" "--patch" "--revisions" "::" ]; aliases.r = [ "rebase" ]; + aliases.res = [ "resolve" ]; + aliases.resolve-ast = [ "resolve" "--tool" "mergiraf" ]; - aliases.rs = [ "resolve-ast" ]; + aliases.resa = [ "resolve-ast" ]; aliases.s = [ "squash" ]; aliases.si = [ "squash" "--interactive" ]; + aliases.sh = [ "show" ]; + aliases.tug = [ "bookmark" "move" "--from" "closest(@-)" "--to" "closest_pushable(@)" ]; + aliases.t = [ "tug" ]; revset-aliases."closest(to)" = "heads(::to & bookmarks())"; revset-aliases."closest_pushable(to)" = "heads(::to & ~description(exact:\"\") & (~empty() | merges()))";