diff --git a/flake.lock b/flake.lock index 1782fb6..a10e382 100644 --- a/flake.lock +++ b/flake.lock @@ -104,16 +104,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1787796349, - "narHash": "sha256-5s+MJAFyemD6lvrtL2c0jQ7P/XChdx1MPXzoCaQY+ic=", + "lastModified": 1788591592, + "narHash": "sha256-NbwVKwKLFl0oXub7oPjvmDaOygCtV2oboeKTu4xXFTk=", "owner": "Homebrew", "repo": "brew", - "rev": "3e3da86e4eaccd23f4ce43df9b0a31b16c707347", + "rev": "08e85c4e42f5d8f1ea17c36cb59cf61c2ccb26c3", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "6.0.20", + "ref": "6.0.22", "repo": "brew", "type": "github" } @@ -137,11 +137,11 @@ "caveman": { "flake": false, "locked": { - "lastModified": 1788481872, - "narHash": "sha256-i7STNoj3+pSUMsn4bEE6lcbrF2EWNUjAOoQoJWTFO6U=", + "lastModified": 1788769183, + "narHash": "sha256-GuCK3oy0DsMOQq7gHjIY/aeaukJcTvelfg+tp7R7Du4=", "owner": "JuliusBrussee", "repo": "caveman", - "rev": "367fdb7f0f8f8e7994b5aab632c7ce5014802b32", + "rev": "15581d14007fd01fb3f132016741962f34936ca2", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "finix": { "locked": { - "lastModified": 1788403395, - "narHash": "sha256-nqsj0NmmYJ1aFj6hHUFQuKnyHSjqyMxcBNI99mMbrfw=", + "lastModified": 1788925336, + "narHash": "sha256-MAN+6GJoQd7CCSGdzA/vovsj/FaTZrbEVHxoA5DE2h4=", "owner": "finix-community", "repo": "finix", - "rev": "f765fafde5e21b9f456827d1bf84a42417abe67d", + "rev": "07d94a712d63ee2ef949f2cfd5c8e0251a812966", "type": "github" }, "original": { @@ -330,11 +330,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1788667371, - "narHash": "sha256-lUb4YTADY8rxog/1/30mxJ6+26mPFFyVtCDTJ/KdKgM=", + "lastModified": 1789185767, + "narHash": "sha256-jaWL9beN3ifjNzNEBxo0abA+TSi0n7Q8LRQvZTxEqaM=", "owner": "rycee", "repo": "nur-expressions", - "rev": "f27bc5e99fcd1660b1fb77027b5d28c97c883f63", + "rev": "811170bb74b11f3b9489618ce77487cc58c79067", "type": "gitlab" }, "original": { @@ -466,11 +466,11 @@ ] }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "type": "github" }, "original": { @@ -594,11 +594,11 @@ ] }, "locked": { - "lastModified": 1783008725, - "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=", + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", "type": "github" }, "original": { @@ -818,11 +818,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1788540977, - "narHash": "sha256-ivLXKkD0nu48r1TGkQrdhzWo/C1z0mxY6lLUvL31OpY=", + "lastModified": 1788962709, + "narHash": "sha256-yCT/nVwI/tj7Nbk0r3vNXOC1BSnZ5yUebE3Ao7Vaw70=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "01be2db87873a986cf496efd78334cd5cc3f19fb", + "rev": "599ff9042c866dcad4bb458979f7be68a6d2ffef", "type": "github" }, "original": { @@ -915,11 +915,11 @@ ] }, "locked": { - "lastModified": 1786156682, - "narHash": "sha256-SEa8XQtrNg90AUeZFE9+lGvYEWd0T2ht/+sKx+kWUak=", + "lastModified": 1788745613, + "narHash": "sha256-clDeTM5itsJPvqpbEkbWUmuPROsz2+YUnTpqsjQDMqU=", "owner": "yayuuu", "repo": "hyprland-scroll-overview", - "rev": "f9248ab6bee770e9d68813b48cc6ca12b3271254", + "rev": "5e96ae20ec73c320248bcf3ff68b330bc1ed4152", "type": "github" }, "original": { @@ -1178,11 +1178,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1788541574, - "narHash": "sha256-DOOEK3GgurYhPmFkKxNsNLHRwp2zv6c5LrvsaA+Zdl8=", + "lastModified": 1788927321, + "narHash": "sha256-99xFLz3ARZBxSn1tB68KhGHg/7ZdkwbDKc2HkoOOqiY=", "owner": "NixOS", "repo": "nix", - "rev": "534f199c9a34ace17d4db26fa3d377ee904bdf03", + "rev": "ef9b726ac81d771a84f4991239a733bdecf8b6e1", "type": "github" }, "original": { @@ -1216,11 +1216,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1788444135, - "narHash": "sha256-ChwTDZPvTmEgZdS30dUfgdXlzAPtZAUWwEH/PfDXZmg=", + "lastModified": 1788930804, + "narHash": "sha256-fEaFq0XgpgWFPLfpq1UK4/8ylHd2T0+fo6O3hKz1LUM=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "ec8417a617de4d3c739aed40837e308ebd667165", + "rev": "590884640fdc8ef437d787da2628a401ebfff6ae", "type": "github" }, "original": { @@ -1236,11 +1236,11 @@ ] }, "locked": { - "lastModified": 1788080100, - "narHash": "sha256-n14luQo3F/ZLfCEHk1QieiI1nGnW92ZQZeZ0UIb0UMQ=", + "lastModified": 1788680125, + "narHash": "sha256-amGSoDobwmp4CFvCn841ws2iuitus+HUJdD/gKgsrJA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "dbb978fa87faf13398e90ccbc52c343d21c7dd6d", + "rev": "116ad1c2adb642405ef8916f6a94c8626f971344", "type": "github" }, "original": { @@ -1261,11 +1261,11 @@ ] }, "locked": { - "lastModified": 1783703343, - "narHash": "sha256-kt38BGQYWXUtNgTV/hCx0tf8IZJFuEGE3/IYoRutha4=", + "lastModified": 1788880344, + "narHash": "sha256-RJUtOh4WFh7wL8OLc140L6qJMKoWNHJoIg5Wm8FiqpA=", "owner": "nixos-bsd", "repo": "nixbsd", - "rev": "2b512eda58e6d77378bd20d6027802b158942e24", + "rev": "82d36e9d6c527a25db2813e012c4f81bbf675f8e", "type": "github" }, "original": { @@ -1288,11 +1288,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1788512400, - "narHash": "sha256-pFiwb+c/lIvMvjSzJONZ+jPi36kbbljys7OFy+Kxt3U=", + "lastModified": 1788962100, + "narHash": "sha256-G5knic2BF44zsDwAEvToreC10cs0ND5J+Limz6eDxII=", "owner": "kaylorben", "repo": "nixcord", - "rev": "004e2c950c0b4a404fb3ea5ab01f5645265e4322", + "rev": "b5a25427cca7ed257549f14437fb468f48591fdb", "type": "github" }, "original": { @@ -1431,11 +1431,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1783148766, - "narHash": "sha256-H9+N+GFtsbVC8ZniHliChM7ndizxtqVZs6bnGOLM3WQ=", - "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030", + "lastModified": 1788690626, + "narHash": "sha256-aVla+xR1lotA4iEMo6ltSr5oKVvWxBZ8Gc9KjbwxJq8=", + "rev": "c25784012c9982bca5b3e0de87e90bbdac8927d3", "type": "tarball", - "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.4193.a50de1b7d8a5/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.9227.c25784012c99/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1550,11 +1550,11 @@ ] }, "locked": { - "lastModified": 1788337237, - "narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=", + "lastModified": 1788914643, + "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57", + "rev": "13616fff713a9f94055c66f15687ebdc17a335df", "type": "github" }, "original": { @@ -1613,11 +1613,11 @@ ] }, "locked": { - "lastModified": 1783703343, - "narHash": "sha256-kt38BGQYWXUtNgTV/hCx0tf8IZJFuEGE3/IYoRutha4=", + "lastModified": 1788880344, + "narHash": "sha256-RJUtOh4WFh7wL8OLc140L6qJMKoWNHJoIg5Wm8FiqpA=", "owner": "nixos-bsd", "repo": "nixbsd", - "rev": "2b512eda58e6d77378bd20d6027802b158942e24", + "rev": "82d36e9d6c527a25db2813e012c4f81bbf675f8e", "type": "github" }, "original": { @@ -1773,11 +1773,11 @@ ] }, "locked": { - "lastModified": 1785945821, - "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { @@ -1837,11 +1837,11 @@ ] }, "locked": { - "lastModified": 1788405419, - "narHash": "sha256-wuGizAVEmY0u15MYrhgy7AoQdHg+4Y2QiC+v/mxA8dc=", + "lastModified": 1788975440, + "narHash": "sha256-xvSJWwuqMTzAS/eKl0T+jAqPi6NVvfPMj5Xr1/3HjZo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fdb83f8fce835213fab7eab52c375926fe1a32dc", + "rev": "2c997bca3b19f8af39e82038646f20e6c92d65ff", "type": "github" }, "original": { diff --git a/modules/dev/hooks.nix b/modules/dev/hooks.nix index d2206df..39e3223 100644 --- a/modules/dev/hooks.nix +++ b/modules/dev/hooks.nix @@ -12,12 +12,18 @@ perSystem = psArgs@{ pkgs, ... }: { - pre-commit.settings.hooks = { - treefmt.enable = true; - deadnix.enable = true; - flake-checker.enable = true; - check-merge-conflicts.enable = true; - convco.enable = true; + pre-commit.settings = { + default_stage = [ + "manual" + "pre-push" + ]; + hooks = { + treefmt.enable = true; + deadnix.enable = true; + flake-checker.enable = true; + check-merge-conflicts.enable = true; + convco.enable = true; + }; }; devShells.default = pkgs.mkShell { diff --git a/modules/programs/editors/nixvim/plugins/misc.nix b/modules/programs/editors/nixvim/plugins/misc.nix index adf17c8..e3c71a6 100755 --- a/modules/programs/editors/nixvim/plugins/misc.nix +++ b/modules/programs/editors/nixvim/plugins/misc.nix @@ -9,6 +9,7 @@ harpoon.enable = true; web-devicons.enable = true; lazygit.enable = true; + jj.enable = true; which-key = { enable = true; settings.notify = true; diff --git a/modules/programs/editors/nixvim/settings.nix b/modules/programs/editors/nixvim/settings.nix index 3462e19..4d1394c 100755 --- a/modules/programs/editors/nixvim/settings.nix +++ b/modules/programs/editors/nixvim/settings.nix @@ -43,6 +43,14 @@ silent = true; }; } + { + action = "LazyJJ"; + mode = "n"; + key = "j"; + options = { + silent = true; + }; + } ]; }; } diff --git a/modules/programs/terminal/jujutsu.nix b/modules/programs/terminal/jujutsu.nix new file mode 100755 index 0000000..79008f5 --- /dev/null +++ b/modules/programs/terminal/jujutsu.nix @@ -0,0 +1,40 @@ +{ config, ... }: +{ + home.base = { + programs.jujutsu.settings.user = { inherit (config.users.eveeifyeve) name email; }; + }; + + homeManager.modules.base = { + programs.jujutsu = { + enable = true; + settings.aliases = { + # st = "status -s"; + # sta = "status"; + # ci = "commit"; + # co = "checkout"; + # cod = "checkout ."; + # rh = "reset HEAD"; + # aa = "add -A"; + # cdf = "clean -df"; + # pr = "pull --rebase"; + # br = "branch"; + # bra = "branch -a"; + # amend = "commit -a --amend --no-edit"; + # ciam = "commit -a --amend --no-edit"; + # + # ei = "add --intent-to-add"; + # eu = "update-index --assume-unchanged"; + # co-author = + # "!co() {" + # + " curl --request GET" + # + " --header 'Accept: application/vnd.github+json'" + # + " --url \"https://api.github.com/users/$@\"" + # + " | jq --raw-output" + # + " '\"Co-authored-by: \\(.name // .login)" + # + " <\\(.id)+\\(.login)@users.noreply.github.com>\"'" + # + " ;};" + # + " co"; + }; + }; + }; +} diff --git a/modules/programs/terminal/tools/lazyjj.nix b/modules/programs/terminal/tools/lazyjj.nix new file mode 100755 index 0000000..dcb67d1 --- /dev/null +++ b/modules/programs/terminal/tools/lazyjj.nix @@ -0,0 +1,8 @@ +{ + homeManager.modules.gui = + { pkgs, ... }: + { + home.shellAliases.ljj = "lazyjj"; + home.packages = [ pkgs.lazyjj ]; + }; +}