From 19551022f04adceb0339d5c7230df867ed9e9e3a Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Tue, 16 Sep 2025 16:54:19 +0100 Subject: [PATCH] add jujutsu vcs --- flake.lock | 88 ++++++++++++++-------------------- home/c/programs/default.nix | 1 + home/c/programs/jj/default.nix | 23 +++++++++ 3 files changed, 60 insertions(+), 52 deletions(-) create mode 100644 home/c/programs/jj/default.nix diff --git a/flake.lock b/flake.lock index 6c4ed10..0521586 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -106,21 +106,6 @@ "type": "github" } }, - "cachix-push": { - "locked": { - "lastModified": 1725315090, - "narHash": "sha256-d/ZGRHfSGPEpCCNSVlfZ0ND2IZV0H9nN/3BLMA7d9fs=", - "owner": "juspay", - "repo": "cachix-push", - "rev": "fbe9734921e19abc4830dc4ea425aaa82cf61991", - "type": "github" - }, - "original": { - "owner": "juspay", - "repo": "cachix-push", - "type": "github" - } - }, "copyparty": { "inputs": { "flake-utils": "flake-utils", @@ -129,11 +114,11 @@ ] }, "locked": { - "lastModified": 1754348197, - "narHash": "sha256-sVl/KDJR7X0bmRc/ccmuAy9HgcQXnnIaiOCWbSGvRPA=", + "lastModified": 1757898317, + "narHash": "sha256-bsaY6m/fEfJY9l0KU+tkMM+QwggNwS/GVw9jl8bHOF8=", "owner": "9001", "repo": "copyparty", - "rev": "b664ebb01f28094749e233ac70795ccd11fed253", + "rev": "fd331a545d6ac9c94287663f79a3379b5171d048", "type": "github" }, "original": { @@ -226,11 +211,11 @@ ] }, "locked": { - "lastModified": 1752718651, - "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", + "lastModified": 1757508292, + "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "owner": "nix-community", "repo": "disko", - "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", + "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "type": "github" }, "original": { @@ -284,11 +269,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1752811437, - "narHash": "sha256-TVWYBcNpeQ3fEloryVP9N2yJnC3vuPpoZF1RqFFWFt0=", + "lastModified": 1757995413, + "narHash": "sha256-vaU/7/PXoym6vnspGxhR29V9klGe9iy9zmp6x7w38f8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "369dccacc0a8214600773b3bbbf68d98a19b74e8", + "rev": "4ae8996b3e139926c784acd22824cde46cd28833", "type": "gitlab" }, "original": { @@ -384,11 +369,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -727,11 +712,11 @@ ] }, "locked": { - "lastModified": 1752780124, - "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", + "lastModified": 1757808926, + "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c718918222bdb104397762dea67e6b397a7927fe", + "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "type": "github" }, "original": { @@ -932,11 +917,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752620740, - "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -1179,7 +1164,6 @@ }, "omnix": { "inputs": { - "cachix-push": "cachix-push", "devour-flake": "devour-flake_2", "false": "false", "flake-parts": "flake-parts_5", @@ -1197,11 +1181,11 @@ "true": "true" }, "locked": { - "lastModified": 1752609340, - "narHash": "sha256-LrcNUiyLOiIgalsP/GsaRh7pe8lpZLRiQHv9jCeJNtQ=", + "lastModified": 1757112869, + "narHash": "sha256-mYaj1ZiujvJkCYR2GK85A8Pr8azMrbj8abpDw4nEz5E=", "owner": "juspay", "repo": "omnix", - "rev": "e967319794c9b9ad7d040dc873eae62adab968f4", + "rev": "7e35ac51e30e94579cfc8f62c8318d4c198d5cb4", "type": "github" }, "original": { @@ -1221,11 +1205,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1757974173, + "narHash": "sha256-4DpXmct/2rcLgScT1CXOLr0TUeIlrBB1rnFqCOf5MUw=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "302af509428169db34f268324162712d10559f74", "type": "github" }, "original": { @@ -1437,11 +1421,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752752240, - "narHash": "sha256-qSQ6oIJeIb5MX6LRszgqQYB46FOHemKrvrdzf2u+uxM=", + "lastModified": 1757957798, + "narHash": "sha256-FT4O5imFJ+FUIGhYj/aFwEEgyvLhuyJ2my8f6mCLtTY=", "owner": "danth", "repo": "stylix", - "rev": "40f40bda4269f6e5490c25975069dc61aede6d52", + "rev": "e6fc25cd12e8f461e402cf34649cc73ad93c7bdd", "type": "github" }, "original": { @@ -1673,11 +1657,11 @@ ] }, "locked": { - "lastModified": 1752055615, - "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { @@ -1703,11 +1687,11 @@ }, "unstable": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { diff --git a/home/c/programs/default.nix b/home/c/programs/default.nix index 0321340..feff4cc 100644 --- a/home/c/programs/default.nix +++ b/home/c/programs/default.nix @@ -4,6 +4,7 @@ ./waybar ./git ./fish + ./jj ./rofi ./rbw ./firefox diff --git a/home/c/programs/jj/default.nix b/home/c/programs/jj/default.nix new file mode 100644 index 0000000..9c166e7 --- /dev/null +++ b/home/c/programs/jj/default.nix @@ -0,0 +1,23 @@ +{lib, ...}: { + programs.jujutsu = { + enable = true; + settings = { + user = { + name = "Callum Leslie"; + email = "git@cleslie.uk"; + }; + signing = { + behavior = "own"; + backend = "gpg"; + }; + "--scope" = [ + { + "--when".repositories = ["~/repos/projects.cs.nott.ac.uk"]; + user = { + email = "psycl6@nottingham.ac.uk"; + }; + } + ]; + }; + }; +}