From d585a60e1d42c422056ca21e89f78e0d9e558c1f Mon Sep 17 00:00:00 2001
From: iofq <cjriddz@protonmail.com>
Date: Fri, 4 Apr 2025 02:21:04 -0500
Subject: [PATCH] jj update from work

---
 home-manager/shared/programs/shell/git.nix | 22 +++++++++++-----------
 home-manager/t14/home.nix                  |  6 ++++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/home-manager/shared/programs/shell/git.nix b/home-manager/shared/programs/shell/git.nix
index 38ecbd3..c609c60 100755
--- a/home-manager/shared/programs/shell/git.nix
+++ b/home-manager/shared/programs/shell/git.nix
@@ -18,14 +18,6 @@
       signByDefault = false;
     };
     extraConfig.pull.rebase = true;
-    aliases = {
-      a = "add . -p";
-      s = "status";
-      f = "fetch";
-      d = "diff";
-      cm = "commit -m";
-      rb = "rebase -i";
-    };
   };
   programs.jujutsu = {
     enable = true;
@@ -34,17 +26,25 @@
         email = "cjriddz@protonmail.com";
         name = "iofq";
       };
+      operation = {
+        username = "iofq";
+      };
       ui = {
-        pager = "${pkgs.bat}/bin/bat";
         default-command = ["log"];
         conflict-marker-style = "git";
         merge-editor = "vimdiff";
+        diff.format  = "git";
+      };
+      merge-tools.vimdiff = {
+          program = "nvim";
       };
       snapshot = {
         max-new-file-size = "10MiB";
       };
-      git = {
-        subprocess = true;
+      aliases = {
+        tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@"];
+        ne = ["next" "--edit"];
+        be = ["edit" "-r" "@-"];
       };
     };
   };
diff --git a/home-manager/t14/home.nix b/home-manager/t14/home.nix
index 89ea584..9f341f2 100755
--- a/home-manager/t14/home.nix
+++ b/home-manager/t14/home.nix
@@ -44,6 +44,12 @@
         hostname = "192.168.1.251";
         identityFile = "/home/e/.ssh/id_ed25519";
       };
+      "10110110.xyz" = {
+        port = 22;
+        hostname = "10110110.xyz";
+        user = "git";
+        identityFile = "/home/e/.ssh/id_ed25519";
+      };
     };
   };
   fonts.fontconfig.enable = lib.mkForce true;