geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

Updates

Browse source
This commit is contained in:
Geoffrey Frogeye 2024-10-30 16:02:33 +01:00
parent 441177a263
commit a08d09328f
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
2 changed files with 45 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hm/git/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }:
{ pkgs, lib, config, unixpkgs, ... }:
let
cfg = config.programs.git;
in
@ -19,10 +19,10 @@ in
cd "${r.path}"
if [ -d .jj ]
then
${lib.getExe pkgs.jujutsu} git fetch
${lib.getExe pkgs.jujutsu} rebase -d main@origin
${lib.getExe pkgs.jujutsu} branch set main -r @-
${lib.getExe pkgs.jujutsu} git push
${lib.getExe config.programs.jujutsu.package} git fetch
${lib.getExe config.programs.jujutsu.package} rebase -d main@origin
${lib.getExe config.programs.jujutsu.package} branch set main -r @-
${lib.getExe config.programs.jujutsu.package} git push
else
${pkgs.git}/bin/git --no-optional-locks diff --quiet || echo "Repository is dirty!"
${pkgs.git}/bin/git pull || true
@ -81,6 +81,10 @@ in
};
jujutsu = {
enable = true;
package = (import unixpkgs {
inherit (pkgs) system;
}).jujutsu;
# Current version doesn't have the "none" signing backend
settings = {
git = {
auto-local-bookmark = true;