From 24eabcf2da20baae343e02bea120e221be2560f9 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Thu, 8 May 2025 00:06:58 +0300 Subject: [PATCH 1/4] feat: jj alises --- modules/common/jujutsu.nix | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/modules/common/jujutsu.nix b/modules/common/jujutsu.nix index 783d767..f844591 100644 --- a/modules/common/jujutsu.nix +++ b/modules/common/jujutsu.nix @@ -25,6 +25,25 @@ in { aliases.".." = [ "edit" "@-" ]; aliases.",," = [ "edit" "@+" ]; + aliases.pull = [ "git" "fetch" ]; + aliases.push = [ "git" "push" ]; + + aliases.init = [ "git" "init" "--colocate" ]; + aliases.i = [ "git" "init" "--colocate" ]; + + aliases.c = "commit"; + aliases.ci = [ "commit" "--interactive" ]; + + aliases.e = "edit"; + aliases.r = "rebase"; + + aliases.s = "squash"; + aliases.si = [ "squash" "--interactive" ]; + + aliases.tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"]; + + revset-aliases."closest_bookmark(to)" = "heads(::to & bookmarks())"; + revsets.log = "present(@) | present(trunk()) | ancestors(remote_bookmarks().., 2) | reachable(@, all())"; ui.default-command = "status"; @@ -33,7 +52,7 @@ in { ui.diff.tool = [ "${getExe pkgs.difftastic}" "--color" "always" "$left" "$right" ]; ui.conflict-marker-style = "snapshot"; - ui.graph.style = if config.theme.cornerRadius > 0 then "curved" else "square"; + ui.graph.style = if config.theme.cornerRadius > 0 then "curved" else "square"; templates.draft_commit_description = /* python */ '' concat( @@ -52,7 +71,7 @@ in { git.subprocess = true; git.fetch = [ "origin" "upstream" "rad" ]; - git.push = "origin"; # TODO: Find a way to make this become rad when origin is up to date. + git.push = "origin"; signing.backend = "ssh"; signing.behavior = "own"; From 4ebce416760a64f4b124fdb852a62877ecba3a5e Mon Sep 17 00:00:00 2001 From: RGBCube Date: Thu, 8 May 2025 00:19:39 +0300 Subject: [PATCH 2/4] feat: don't -q ssh --- rebuild.nu | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rebuild.nu b/rebuild.nu index 93e6d01..b69c984 100755 --- a/rebuild.nu +++ b/rebuild.nu @@ -2,7 +2,7 @@ def --wrapped sync [...arguments] { (rsync - --rsh "ssh -q" + --rsh "ssh" --compress --delete --recursive --force --delete-excluded @@ -22,14 +22,14 @@ def main --wrapped [ } if $host != (hostname) { - ssh -q -tt $host $" + ssh -tt $host $" rm -rf ncc " git ls-files | sync --files-from - ./ ($host + ":ncc") - ssh -q -tt $host $" + ssh -tt $host $" cd ncc ./rebuild.nu ($host) ($arguments | str join ' ') " From 05fa7662a2940b63b329cd4d16af5f9073fe7d37 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Thu, 8 May 2025 00:21:32 +0300 Subject: [PATCH 3/4] feat: update lock --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index ce2de8e..0386499 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1745995211, - "narHash": "sha256-hf6Xu3KS06WyE/3dqV96iLGx3jIYQq9e68iCEFHrt04=", + "lastModified": 1746599904, + "narHash": "sha256-bykoJKLSbNANMY5nedzVYa2Z3GF8poQsNTHAnc19alM=", "owner": "nix-community", "repo": "fenix", - "rev": "0db04339c4e4c0fd42dbbaebe3590a67cbd12aa3", + "rev": "589e863010225278a042480fed5b6feacb364a65", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1744389758, - "narHash": "sha256-ltnGWY4ub2KfWQloPkTRVSY1lWg9RoOeuvU1jvDsDeY=", + "lastModified": 1746536662, + "narHash": "sha256-rcHrc39hdGcMg2MRzcj2nMW07ga4YbJMkcMUkeew+MU=", "owner": "RGBCube", "repo": "GitHub2Forgejo", - "rev": "875305869a90017a83991d80134a91f7b4d166c2", + "rev": "ba581ae4f2726257682ad626d4f657898d44ce05", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1746040799, - "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", + "lastModified": 1746632058, + "narHash": "sha256-Mp5Bbvb+YlFEZ76C/0wFS6C1lRfH3D60u465wFNlnS0=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f217e5a319f6c186283b530f8c975e66c028433", + "rev": "708074ae6db9e0468e4f48477f856e8c2d059795", "type": "github" }, "original": { @@ -185,11 +185,11 @@ ] }, "locked": { - "lastModified": 1745816321, - "narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=", + "lastModified": 1746254942, + "narHash": "sha256-Y062AuRx6l+TJNX8wxZcT59SSLsqD9EedAY0mqgTtQE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01", + "rev": "760a11c87009155afa0140d55c40e7c336d62d7a", "type": "github" }, "original": { @@ -208,11 +208,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1745416927, - "narHash": "sha256-jg725STLRgsIAgrvjbRJQEP0F0w+rmvDJ64EN65p6EI=", + "lastModified": 1746637515, + "narHash": "sha256-bUq2uHmsfY3SpJrR4dpncITykufTiD2320JsOKgIYl0=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "ab52efd622a9f7dca269a49edbbea6b6b7294f57", + "rev": "a7d2b05a9920d90f5eb8076f449acdb6c1ad79ca", "type": "gitlab" }, "original": { @@ -224,11 +224,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1745949276, - "narHash": "sha256-9ZK31t2HUiGdLLnDafrRnSrrO12JwqcAFbrJ9nRwh0Y=", + "lastModified": 1746522319, + "narHash": "sha256-q+Qo00BFgXN6xKrsrQI1P7Z3K1s2zKT0GNl0h8DwBH4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "78a488dd5e7e4f17162001519665795e6e68b6f8", + "rev": "debaef80be92d957f52d6e89c86286556075ea47", "type": "github" }, "original": { From a889cc675e2cd82eff24af35c51add75242a5c79 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Thu, 8 May 2025 01:26:49 +0300 Subject: [PATCH 4/4] feat: jj clone & jj cl alias --- modules/common/jujutsu.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/common/jujutsu.nix b/modules/common/jujutsu.nix index f844591..791d76c 100644 --- a/modules/common/jujutsu.nix +++ b/modules/common/jujutsu.nix @@ -28,6 +28,9 @@ in { aliases.pull = [ "git" "fetch" ]; aliases.push = [ "git" "push" ]; + aliases.clone = [ "git" "clone" "--colocate" ]; + aliases.cl = [ "git" "clone" "--colocate" ]; + aliases.init = [ "git" "init" "--colocate" ]; aliases.i = [ "git" "init" "--colocate" ];