jj: improve ux

home-manager/common.nix

@@ -147,7 +147,12 @@
 
   home.shellAliases = {
   	lg = "lazygit";
-	gs = "git status";
+  	gs = "git status";
+  	j  = "jj";
+  	js = "jj status";
+  	jt = "jj tug";
+  	jf = "jj git fetch";
+  	jl = "jj log";
   };
 
   programs.fish = {
@@ -173,7 +178,12 @@
   #programs.helix.enable = true;
   #programs.helix.defaultEditor = true;
 
-  programs.zoxide.enable = true;
+  programs.zoxide = {
+	  enable = true;
+	  options = [
+		  "--cmd z"
+	  ];
+  };
   programs.bash = {
     enable = true;
     initExtra = ''

jj/.config/jj/config.toml

@@ -10,11 +10,18 @@ email = "j@sanchezrada.es"
 name = "J. Fernando Sánchez"
 email = "f.sanchez@thechannelstore.tv"
 
+[aliases]
+tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]
+l = ["log"]
+s = ["status"]
+f = ["git", "fetch"]
+p = ["git", "push"]
 
 [ui]
 pager = "delta" #":builtin"
 diff-formatter=":git"
 paginate = "auto"
+default-command = ["log", "--reversed"]
 
 [merge-tools.delta]
 diff-args=["--color-only", "--side-by-side", "$left", "$right", "--width=$width"]