From 627b03ba50990810bfa78d7541ee8cf5d760acef Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Tue, 7 Jul 2026 15:28:13 +0200 Subject: [PATCH] Update stuff --- flake.lock | 56 +++++++++++++++++------------------ modules/cli/home.nix | 3 +- modules/cli/tools/jujutsu.nix | 1 + 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 5250f5e..9c5bbc1 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1783222121, - "narHash": "sha256-E/ElL373TO8lQ2aMvYyzN+k4xkVaUGoRqoa8AtM71tI=", + "lastModified": 1783963347, + "narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1645f40777620c4bd2b6d854b290c2fc354a266", + "rev": "a45a7c451455a51ae740ec3bce4024b312809c29", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1783209806, - "narHash": "sha256-YKUtOu/HmaL8hD2FgAWZ/ZnXti6dau7kvq7BQ/oDdOU=", + "lastModified": 1783814585, + "narHash": "sha256-xJYKRfI7kK/h08q5iVi9baAWe9Tx/zHkF+sW97g5aHg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "a4af0dcfd0788d45088dfed9d7fa50ce16070c97", + "rev": "f27953eea28eb3a0bf58d84e8d51f65b1dfed481", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1783199847, - "narHash": "sha256-TiDFXEa4zEPMX8TvsrbMunQYJPGWQhXBTngi23lAY6g=", + "lastModified": 1783808427, + "narHash": "sha256-apvyZdfVD8K271Fe8qb8P2dJB1sGw1lts2js6adUgL8=", "owner": "neovim", "repo": "neovim", - "rev": "3b8c19ea460b4abb5b74f91e05a14c0fcf9cc6a6", + "rev": "41294e42533daf937410b6285e20a7c0a898f9a8", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1781761792, - "narHash": "sha256-rCPytmKNjctLloB6UgK5CRrHSwV4b0ygxtJLPPp8R14=", + "lastModified": 1783395956, + "narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a1fa429e945becaf60468600daf649be4ba0350c", + "rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1783233851, - "narHash": "sha256-jzisD+3wWZPC4QvAsKtYguiGsmlH2SN3Mjx5LWd68Ok=", + "lastModified": 1783864904, + "narHash": "sha256-BQxN5UMg9FOevAsgBRwPxfxlh51Puj+dNn/8Dsi3sPM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "fab14c7b63499d57cb6673d5690168c3ec42b99a", + "rev": "1111b9bc836afb7e31a7014e8d1272de9b1c917d", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1782562157, - "narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", + "lastModified": 1784100666, + "narHash": "sha256-HF/mrw5NYQfKFZgkfV2h1UL5/E3ccfsE2XJ1AbbLLJ0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a9cf7546a938c737b079e738de73934a13de9784", + "rev": "fccfa9031a85b78a437f2f153c1f6449f3bc3185", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1781182279, - "narHash": "sha256-V5EQQbDnmdiXGQXrEF1PEL7QYsFqfH8N1E89Z5ONwFk=", + "lastModified": 1784058842, + "narHash": "sha256-3u3tvbCIAid3Mv7RrJx13jusIEQC/HeKYhO/SUSxR3A=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "5675822ba756e6e56f8f6a5a76e90e0da2ece94d", + "rev": "24c8dc8e0f2170e1a377be24dfadc7d9d21dc1ad", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1783214977, - "narHash": "sha256-Klkkjf1yS7qTIGhQV5p1kmUcM8/rZwpr6LlR/noA8N8=", - "rev": "6edbf1a6a03e75886a6609c088801a0856449e88", + "lastModified": 1783915482, + "narHash": "sha256-w9ktuEgDIWGsX58tR3nI5HBGNy1idO8KY4urO3msko0=", + "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1027850.6edbf1a6a03e/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1033616.6cdc7fc76e8b/nixexprs.tar.xz" }, "original": { "id": "nixpkgs", @@ -334,11 +334,11 @@ ] }, "locked": { - "lastModified": 1783063092, - "narHash": "sha256-H6lM+h8+ZT25uWJwmYkER5yj5RJ9DP2++n5um/XH3J0=", + "lastModified": 1783668749, + "narHash": "sha256-EDJjJYGT5pQKTBqmz+OA2sqE20kjj6mP699JFGDzse4=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "36b24209358c82e0ea5404ba003ae8dc37334c86", + "rev": "e8041a3571e8cadb57dc18a3d6362d753510b94a", "type": "github" }, "original": { diff --git a/modules/cli/home.nix b/modules/cli/home.nix index 00ed4c7..d38dd45 100644 --- a/modules/cli/home.nix +++ b/modules/cli/home.nix @@ -91,7 +91,8 @@ xdg.configFile."claude/CLAUDE.md".text = '' # Global instructions - - NEVER EVER commit. Do not run `git commit` (or `jj commit`) and never push changes under any circumstances unless the user explicitly asks you to commit in that message. + - NEVER EVER commit ; don't talk about commiting we do not care. Do not run `git commit` (or `jj commit`) and never push changes under any circumstances unless the user explicitly asks you to commit in that message. + - Do not edit run git commands to write/checkout/whatever. Use jj if you REALLY REALLY need it but you should not touch the git/jj state in most cases. - when fetching github content/pr/issues/wha, use the `gh` cli. ''; diff --git a/modules/cli/tools/jujutsu.nix b/modules/cli/tools/jujutsu.nix index 3a870a3..bda5707 100644 --- a/modules/cli/tools/jujutsu.nix +++ b/modules/cli/tools/jujutsu.nix @@ -25,6 +25,7 @@ }; aliases = { init = ["git" "init" "--colocate"]; + clone = ["git" "clone" "--colocate"]; tug = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "closest_pushable(@)"]; }; revset-aliases = {