diff --git a/flake.lock b/flake.lock index 765ff90..4bfeeb0 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1768942641, - "narHash": "sha256-i25tkhqjsfo0YKz8To/+gzazW1v4f8qUGqJQ8OLrkqE=", + "lastModified": 1769978395, + "narHash": "sha256-gj1yP3spUb1vGtaF5qPhshd2j0cg4xf51pklDsIm19Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "9997de2f62d1875644f02ddf96cf485a4baecb6f", + "rev": "984708c34d3495a518e6ab6b8633469bbca2f77a", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1768941735, - "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=", + "lastModified": 1769548169, + "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54", + "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1768953881, - "narHash": "sha256-czdbiHZT2Ul3Oh5QfOgxWOb5rcOIX7oD0MznaU64vEI=", + "lastModified": 1770026412, + "narHash": "sha256-Dz+35+Cxwf/T9Ygo4xrOsYNWsAYXWSjbgRAkY7PcoEg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "574a0de26b2b36447a32dd9a10653cfd19ecf92b", + "rev": "4b61b663d49d85f977c913cde50eaaa3459a2d89", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1768952091, - "narHash": "sha256-FGZ3rTKc6g2Cvqf1J7Py7/xUQ44M3PhS/cNt4rTEUus=", + "lastModified": 1769988171, + "narHash": "sha256-RVMU3KOFxmp1z5XsEd5/eJJKYG3096/9uwqzsv5G9bs=", "owner": "neovim", "repo": "neovim", - "rev": "87276db7f9b2671ed9f416b4484dfc613dd3a83e", + "rev": "0566767d7dbe5b2abce8d37aab85d328629b2cc7", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1768917842, - "narHash": "sha256-wZ2RdXNLbDdgrf2zoNsnFGZB2CtreDh9n6zr6HPBwUI=", + "lastModified": 1769132082, + "narHash": "sha256-cJVUBVP3qmRO2HGHqj18ChjOSztyo7eqElQJMRpWXw8=", "owner": "nix-community", "repo": "nixos-avf", - "rev": "305eee65ce15d7e37b5672927fcd5a83e78837ce", + "rev": "d0a62c3f64b45a39570fde31a3a490b214bf19ee", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1768736227, - "narHash": "sha256-qgGq7CfrYKc3IBYQ7qp0Z/ZXndQVC5Bj0N8HW9mS2rM=", + "lastModified": 1769302137, + "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d447553bcbc6a178618d37e61648b19e744370df", + "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "type": "github" }, "original": { @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1768840529, - "narHash": "sha256-e22ou8nikeThx9x9/y29VdMEW4Fm7DBzlhp9ndDJUGE=", + "lastModified": 1769217863, + "narHash": "sha256-RY9kJDXD6+2Td/59LkZ0PFSereCXHdBX9wIkbYjRKCY=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "b8e9a758fa2e08d8ac5c3be5d4b1fcc92fd3ce84", + "rev": "38a5250e57f583662eac3b944830e4b9e169e965", "type": "github" }, "original": { @@ -264,11 +264,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1768886240, - "narHash": "sha256-C2TjvwYZ2VDxYWeqvvJ5XPPp6U7H66zeJlRaErJKoEM=", + "lastModified": 1769789167, + "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80e4adbcf8992d3fd27ad4964fbb84907f9478b0", + "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "tmux": { "flake": false, "locked": { - "lastModified": 1768923742, - "narHash": "sha256-dRkPHiR1QZBhXyh5M7FqX4mOo90q/vi3uZBFsjodfio=", + "lastModified": 1769621142, + "narHash": "sha256-+dLXSVPZezGuJPsTAbp6eyhQFSa3AZrdQwEvJHq6GXw=", "owner": "tmux", "repo": "tmux", - "rev": "d2e09cb2597bf585ea45c0e584326a73e222a438", + "rev": "d7f59eccaf7f9435065017fa214a7b3c53bc631d", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1767618227, - "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=", + "lastModified": 1769747637, + "narHash": "sha256-fRdj480sqW/a+APO6CmelZsa07BRAdEQLUjBQJuyQbU=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "1586e49b3908b058e221f11d843eb46392dba17b", + "rev": "09e429679b7cc175e71e2d25800bab66493c1c80", "type": "github" }, "original": { diff --git a/modules/cli/tools/jujutsu.nix b/modules/cli/tools/jujutsu.nix index 0298b7f..4b4163f 100644 --- a/modules/cli/tools/jujutsu.nix +++ b/modules/cli/tools/jujutsu.nix @@ -24,6 +24,7 @@ }; }; aliases = { + init = ["git" "init" "--colocate"]; tug = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "closest_pushable(@)"]; }; revset-aliases = { diff --git a/nvim/lua/plugins/git.lua b/nvim/lua/plugins/git.lua index bd00283..ee60774 100644 --- a/nvim/lua/plugins/git.lua +++ b/nvim/lua/plugins/git.lua @@ -93,6 +93,7 @@ return { local cmd = require("jj.cmd") vim.keymap.set("n", "jd", cmd.describe, { desc = "JJ describe" }) + vim.keymap.set("n", "jc", cmd.commit, { desc = "JJ commit" }) vim.keymap.set("n", "jl", cmd.log, { desc = "JJ log" }) vim.keymap.set("n", "jL", function() cmd.log({ revisions = "'all()'" })