ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix gpgsm path in git config; Add safe directory

Browse Source
This commit is contained in:
Stefan Ellmauthaler 2022-04-28 16:22:56 +02:00
parent 1cdca85b7f
commit 814c639775
Failed to extract signature
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/emacs/default.el
View File

@ -202,7 +202,7 @@
("<f6>" . magit-log) ("<f6>" . magit-log)
("<f7>" . magit-status)) ("<f7>" . magit-status))
:custom :custom
(magit-commit-signoff t) ;(magit-commit-signoff t)
(magit-define-global-key-bindings t) (magit-define-global-key-bindings t)
(magit-revert-buffers 'silent t) (magit-revert-buffers 'silent t)
(magit-use-overlays nil)) (magit-use-overlays nil))

3
users/ellmau/git.nix
View File

@ -11,7 +11,7 @@
core = { editor = "emacsclient"; }; core = { editor = "emacsclient"; };
gpg = lib.mkIf config.variables.git.gpgsm { gpg = lib.mkIf config.variables.git.gpgsm {
format = "x509"; format = "x509";
program = "gpgsm"; program = "${pkgs.gpgsm}/bin/gpgsm";
}; };
#gpg = { #gpg = {
# format = "x509"; # format = "x509";
@ -20,6 +20,7 @@
user = { signingKey = config.variables.git.key; }; user = { signingKey = config.variables.git.key; };
init = { defaultBranch = "main";}; init = { defaultBranch = "main";};
branch = { autosetuprebase = "always";}; branch = { autosetuprebase = "always";};
safe.directory = [ "/etc/nixos" ];
}; };
lfs.enable = true; lfs.enable = true;
}; };