files/config/fish/vcs.fish

@@ -53,6 +53,15 @@ function vcs_log
     commandline -f repaint
 end
 
+function vcs_ui
+    if __jj_in_repo
+        lazyjj
+    else
+        gitui
+    end
+    commandline -f repaint
+end
+
 # Abbreviations
 
 abbr -a d vcs_diff
@@ -62,5 +71,6 @@ abbr -a s vcs_status
 bind \c_ vcs_jump
 bind \ea vcs_log
 bind \ee vcs_broot
+bind \eg vcs_ui
 bind \eS vcs_diff
 bind \es vcs_status

flake.lock

@@ -134,11 +134,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1735924432,
-        "narHash": "sha256-OxI6QxoMsKBBTaH+RNFPIE7kiqYyv8DnO1y8zLWK36g=",
+        "lastModified": 1735875799,
+        "narHash": "sha256-EI6C+CRmfHqkjnp0aJxYb/pTImwb5FZOu1HWHnnZsOc=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "7eb35d72758a984c6c028272e6f53b7694e42b60",
+        "rev": "e2f9eb6a6f4dc2108f91293938374c0ed314dcb8",
         "type": "github"
       },
       "original": {
@@ -221,11 +221,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735925111,
-        "narHash": "sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY=",
+        "lastModified": 1735900408,
+        "narHash": "sha256-U+oZBQ3f5fF2hHsupKQH4ihgTKLHgcJh6jEmKDg+W10=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ef64efdbaca99f9960f75efab991e4c49e79a5f1",
+        "rev": "1c8d4c8d592e8fab4cff4397db5529ec6f078cf9",
         "type": "github"
       },
       "original": {
@@ -241,11 +241,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1735928141,
-        "narHash": "sha256-KN5rfdDj3vB/GNVw4YZU4tJv2BnUQiQdOz1kEQyketI=",
+        "lastModified": 1733685432,
+        "narHash": "sha256-kUfwjdQGq0UcIlVnNf/z0iG+y7SHf/ZZLVKXDyvDkVg=",
         "owner": "dln",
         "repo": "jj",
-        "rev": "cb103fb4692c4e2b90c4663804b81a5ff1e49c06",
+        "rev": "b6608a03881542d6a8c98f659b80b57a27906096",
         "type": "github"
       },
       "original": {
@@ -297,18 +297,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731890469,
-        "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5083ec887760adfe12af64830a66807423a859a7",
-        "type": "github"
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "path": "/nix/store/8vz84mqgnm1gz5yk7hgnnb5gir5hjxas-source",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "type": "path"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
       }
     },
     "nixpkgs-stable": {
@@ -393,11 +390,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
         "type": "github"
       },
       "original": {
@@ -426,11 +423,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732242723,
-        "narHash": "sha256-NWI8csIK0ujFlFuEXKnoc+7hWoCiEtINK9r48LUUMeU=",
+        "lastModified": 1735871325,
+        "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a229311fcb45b88a95fdfa5cecd8349c809a272a",
+        "rev": "a599f011db521766cbaf7c2f5874182485554f00",
         "type": "github"
       },
       "original": {

home/common/vcs.nix

@@ -7,6 +7,7 @@
     difftastic
     git-get
     git-graph
+    lazyjj
     tea
   ];
 
@@ -129,6 +130,43 @@
     };
   };
 
+  programs.gitui = {
+    enable = true;
+    keyConfig = ''
+      (
+       open_help: Some(( code: F(1), modifiers: "")),
+       move_left: Some(( code: Char('h'), modifiers: "")),
+       move_right: Some(( code: Char('l'), modifiers: "")),
+       move_up: Some(( code: Char('k'), modifiers: "")),
+       move_down: Some(( code: Char('j'), modifiers: "")),
+       popup_up: Some(( code: Char('p'), modifiers: "CONTROL")),
+       popup_down: Some(( code: Char('n'), modifiers: "CONTROL")),
+       page_up: Some(( code: Char('b'), modifiers: "CONTROL")),
+       page_down: Some(( code: Char('f'), modifiers: "CONTROL")),
+       home: Some(( code: Char('g'), modifiers: "")),
+       end: Some(( code: Char('G'), modifiers: "SHIFT")),
+       shift_up: Some(( code: Char('K'), modifiers: "SHIFT")),
+       shift_down: Some(( code: Char('J'), modifiers: "SHIFT")),
+       edit_file: Some(( code: Char('I'), modifiers: "SHIFT")),
+       status_reset_item: Some(( code: Char('U'), modifiers: "SHIFT")),
+       diff_reset_lines: Some(( code: Char('u'), modifiers: "")),
+       diff_stage_lines: Some(( code: Char('s'), modifiers: "")),
+       stashing_save: Some(( code: Char('w'), modifiers: "")),
+       stashing_toggle_index: Some(( code: Char('m'), modifiers: "")),
+       stash_open: Some(( code: Char('l'), modifiers: "")),
+       abort_merge: Some(( code: Char('M'), modifiers: "SHIFT")),
+       )
+      	 '';
+    theme = ''
+      (
+       selection_bg: Some(Black),
+       selection_fg: Some(Reset),
+       cmdbar_bg: Some(Reset),
+       cmdbar_extra_lines_bg: Some(Reset),
+      )
+    '';
+  };
+
   programs.jujutsu = {
     enable = true;
     package = inputs.jujutsu.packages.${pkgs.system}.default;