up

Signed-off-by: Christoph Schmatzler <christoph@schmatzler.com>

modules/home/jujutsu.nix

@@ -1,5 +1,11 @@
 {
   programs.jujutsu = {
     enable = true;
+    settings = {
+      user = {
+        name = "Christoph Schmatzler";
+        email = "christoph@schmatzler.com";
+      };
+    };
   };
 }

modules/home/starship.nix

@@ -5,7 +5,7 @@
     settings = {
       add_newline = true;
       command_timeout = 200;
-      format = "[$directory$git_branch]($style)$character";
+      format = "[$directory$\{custom.jj}]($style)$character";
       character = {
         error_symbol = "[✗ ](bold #e64553)";
         success_symbol = "[❯](bold #40a02b)[❯](bold #df8e1d)[❯](bold #dc8a78)";
@@ -16,9 +16,29 @@
         repo_root_style = "bold cyan";
         repo_root_format = "[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) ";
       };
-      git_branch = {
+      custom.jj = {
-        format = "[$branch]($style) ";
+        command = ''
-        style = "bold";
+          jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '
+            separate(" ",
+              change_id.shortest(4),
+              bookmarks,
+              "|",
+              concat(
+                if(conflict, "💥"),
+                if(divergent, "🚧"),
+                if(hidden, "👻"),
+                if(immutable, "🔒"),
+              ),
+              raw_escape_sequence("\x1b[1;32m") ++ if(empty, "(empty)"),
+              raw_escape_sequence("\x1b[1;32m") ++ coalesce(
+                truncate_end(29, description.first_line(), "…"),
+                "(no description set)",
+              ) ++ raw_escape_sequence("\x1b[0m"),
+            )
+          '
+        '';
+        when = "jj --ignore-working-copy root";
+        symbol = "🥋";
       };
     };
   };

modules/packages.nix

@@ -2,23 +2,24 @@
 with pkgs; [
   (callPackage ./bin/open-project.nix {})
   age
-  devenv
-  lsof
   alejandra
   delta
+  devenv
   docker
   docker-compose
   fastfetch
   fd
+  fira-code
   gh
   git
   gnumake
   gnupg
   htop
   hyperfine
-  fira-code
+  jjui
   jq
   killall
+  lsof
   nurl
   openssh
   postgresql_17