mirror of
https://github.com/ellmau/nixos.git
synced 2025-12-19 09:29:36 +01:00
Fix gpgsm path in git config; Add safe directory
This commit is contained in:
parent
1cdca85b7f
commit
814c639775
@ -202,7 +202,7 @@
|
||||
("<f6>" . magit-log)
|
||||
("<f7>" . magit-status))
|
||||
:custom
|
||||
(magit-commit-signoff t)
|
||||
;(magit-commit-signoff t)
|
||||
(magit-define-global-key-bindings t)
|
||||
(magit-revert-buffers 'silent t)
|
||||
(magit-use-overlays nil))
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
core = { editor = "emacsclient"; };
|
||||
gpg = lib.mkIf config.variables.git.gpgsm {
|
||||
format = "x509";
|
||||
program = "gpgsm";
|
||||
program = "${pkgs.gpgsm}/bin/gpgsm";
|
||||
};
|
||||
#gpg = {
|
||||
# format = "x509";
|
||||
@ -20,6 +20,7 @@
|
||||
user = { signingKey = config.variables.git.key; };
|
||||
init = { defaultBranch = "main";};
|
||||
branch = { autosetuprebase = "always";};
|
||||
safe.directory = [ "/etc/nixos" ];
|
||||
};
|
||||
lfs.enable = true;
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user