about summary refs log tree commit diff
path: root/hosts
diff options
context:
space:
mode:
authorBaitinq <[email protected]>2025-09-08 23:07:51 +0200
committerBaitinq <[email protected]>2025-09-08 23:07:51 +0200
commit1fbeb6bc3f59442f818bcfc56d6192332f8f49a6 (patch)
tree811f0d7c2cdcd72d13857290a56fd5ab35be3804 /hosts
parentHosts: Setup jujutsu with git-crypt support (diff)
downloadnixos-config-1fbeb6bc3f59442f818bcfc56d6192332f8f49a6.tar.gz
nixos-config-1fbeb6bc3f59442f818bcfc56d6192332f8f49a6.tar.bz2
nixos-config-1fbeb6bc3f59442f818bcfc56d6192332f8f49a6.zip
Hosts: Improve jujutsu config
Diffstat (limited to 'hosts')
-rw-r--r--hosts/home.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/hosts/home.nix b/hosts/home.nix
index 045d277..4368510 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -190,6 +190,13 @@
           name = "Baitinq";
           email = "[email protected]";
         };
+        ui = {
+          diff-formatter = ":git";
+          conflict-marker-style = "git";
+        };
+        aliases = {
+          tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
+        };
         signing = {
           behavior = "own";
           backend = "gpg";