diff options
Diffstat (limited to 'share/cfg')
| -rw-r--r-- | share/cfg/git.nix | 16 | ||||
| -rw-r--r-- | share/cfg/jujutsu.nix | 7 |
2 files changed, 13 insertions, 10 deletions
diff --git a/share/cfg/git.nix b/share/cfg/git.nix index 71cac27..4651797 100644 --- a/share/cfg/git.nix +++ b/share/cfg/git.nix @@ -1,15 +1,17 @@ { ... }: { programs.git = { - userEmail = "mbastaja@sorre.xyz"; - userName = "Miran Bastaja"; + settings = { + user = { + name = "Isabella Bastaja"; + email = "isabella@sorre.xyz"; + }; + init.defaultBranch = "main"; + }; signing = { - key = "mbastaja@sorre.xyz"; + key = "isabella@sorre.xyz"; signByDefault = true; }; - delta.enable = true; - extraConfig = { - init.defaultBranch = "main"; - }; }; + programs.delta.enableGitIntegration = true; } diff --git a/share/cfg/jujutsu.nix b/share/cfg/jujutsu.nix index 20fac3d..25c9508 100644 --- a/share/cfg/jujutsu.nix +++ b/share/cfg/jujutsu.nix @@ -2,14 +2,14 @@ { programs.jujutsu.settings = { user = { - email = "mbastaja@sorre.xyz"; - name = "Miran Bastaja"; + email = "isabella@sorre.xyz"; + name = "Isabella Bastaja"; }; ui.paginate = "never"; signing = { behavior = "own"; backend = "gpg"; - key = "mbastaja@sorre.xyz"; + key = "isabella@sorre.xyz"; backends.gpg.allow-expired-keys = false; }; git = { @@ -26,4 +26,5 @@ "(main..@):: | (main..@)-" ]; }; + programs.delta.enableJujutsuIntegration = true; } |
