common/fragments/graphical/default.nix

@@ -13,7 +13,7 @@
     just
     magic-wormhole
     mediainfo
-    nixd
+    nil
     pfetch
     whois
     yt-dlp

common/home_manager/common.nix

@@ -4,9 +4,6 @@
   lib,
   ...
 }:
-let
-  cfg = config.home-manager.users.agatha;
-in
 {
   imports = [
     ../../common/home_manager/helix.nix
@@ -28,7 +25,6 @@ in
       fzf
       ouch
       ripgrep
-      (lib.mkIf (cfg.programs.starship.enable && cfg.programs.jujutsu.enable) (unstable.jj-starship))
     ];
 
     programs = {
@@ -40,17 +36,18 @@ in
         settings = {
           add_newline = false;
           format = lib.concatStrings [
-            "[λ](yellow) $hostname"
+            "[$hostname](bold red)"
+            "$character"
             "$directory"
           ];
           right_format = lib.concatStrings [
-            "$\{custom.jj}"
-            "$status"
+            "$git_branch"
+            " "
             "$cmd_duration"
           ];
-
-          hostname = {
-            format = "[$hostname](bold blue) ";
+          character = {
+            success_symbol = "";
+            error_symbol = "[ ⇣](purple)";
           };
           directory = {
             truncation_length = 2;
@@ -59,24 +56,17 @@ in
             style = "cyan";
             read_only_style = "cyan";
           };
-          custom.jj = {
-            when = "jj-starship detect";
-            shell = [
-              "jj-starship"
-              "--no-jj-prefix"
-              "--no-jj-status"
-              "--no-git-prefix"
-              "--no-git-status"
-            ];
-            format = "$output ";
-          };
-          status = {
-            format = "[$common_meaning$maybe_int ](bright-cyan)";
-            disabled = false;
-          };
           cmd_duration = {
             min_time = 10000;
           };
+          git_branch = {
+            format = "$symbol $branch";
+            symbol = "󰘬";
+          };
+          hostname = {
+            ssh_only = false;
+            format = "$hostname";
+          };
         };
       };