Merge branch 'master' of github.com:aciceri/emacs

This commit is contained in:
Andrea Ciceri 2023-02-16 12:04:28 +01:00
commit 39bc619beb
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
2 changed files with 8 additions and 6 deletions

View file

@ -31,11 +31,13 @@
package = ccrEmacsConfig.package; package = ccrEmacsConfig.package;
}; };
services.emacs = { services.emacs = {
enable = true; # TODO Re-enable, this is causing some problems with magit, probably it
client.enable = true; # would be sufficient disabling `socketActivation`
defaultEditor = true; enable = false;
socketActivation.enable = true; client.enable = false;
startWithUserSession = true; defaultEditor = false;
socketActivation.enable = false;
startWithUserSession = false;
}; };
home.packages = with pkgs; home.packages = with pkgs;
[ [