From 6c09ec28a3a3b6256a772e4a1911ecef0dc7f593 Mon Sep 17 00:00:00 2001 From: reo101 Date: Thu, 28 Nov 2024 14:30:28 +0200 Subject: [PATCH] feat(scm): use `YubiKey` by default for signing, update `jj` revsets --- modules/home-manager/reo101-scm/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/home-manager/reo101-scm/default.nix b/modules/home-manager/reo101-scm/default.nix index f277296..04afacf 100644 --- a/modules/home-manager/reo101-scm/default.nix +++ b/modules/home-manager/reo101-scm/default.nix @@ -32,7 +32,10 @@ in # TODO: module options??? name = "reo101"; email = "pavel.atanasov2001@gmail.com"; - key = "675AA7EF13964ACB"; + # NOTE: GPG + # key = "675AA7EF13964ACB"; + # NOTE: YubiKey + key = "7DA978E6383E5885"; in { home.packages = with pkgs; builtins.concatLists [ @@ -99,11 +102,11 @@ in log = "@ | bases | branches | curbranch::@ | @::nextbranch | downstream(@, branchesandheads)"; }; revset-aliases = { - "bases" = "dev"; + "bases" = "master"; "downstream(x,y)" = "(x::y) & y"; - "branches" = "downstream(trunk(), branches()) & mine()"; + "branches" = "downstream(trunk(), bookmarks()) & mine()"; "branchesandheads" = "branches | (heads(trunk()::) & mine())"; - "curbranch" = "latest(branches::@- & branches)"; + "currbranch" = "latest(branches::@- & branches)"; "nextbranch" = "roots(@:: & branchesandheads)"; }; };